Browse Source

Hopefully fix stashing for git syncc

Samuel W. Flint 4 years ago
parent
commit
f0d9289003
1 changed files with 3 additions and 3 deletions
  1. 3 3
      git-mysync

+ 3 - 3
git-mysync

@@ -16,7 +16,7 @@ if [ -d .git/annex ] ; then
 fi
 
 [ -e pre-sync ] && sh pre-sync
-git stash push -u -m "SYNC SAVE"
+git stash push -m "SYNC SAVE"
 git pull --all
 
 [ -e mid-sync ] && sh mid-sync
@@ -28,6 +28,6 @@ rm "${TEMP}"
 
 git push --all origin
 [ -e post-sync ] && sh post-sync
-if git stash list | grep "SYNC SAVE" >/dev/null ; then
-    git stash pop -q
+if git stash list | head -n1 | grep "SYNC SAVE" >/dev/null ; then
+    git stash pop
 fi