Prevent send-pack from segfaulting when a branch doesn't match

diff --git a/git-stash.sh b/git-stash.sh
index 873e7be6ad1f1906546f13fb59f624e2f4e37ae2..7ba61625baff8236f51d6c0babe9747c43664351 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -57,7 +57,7 @@ save_stash () {
 
        # state of the index
        i_tree=$(git write-tree) &&
-       i_commit=$(printf 'index on %s' "$msg" |
+       i_commit=$(printf 'index on %s\n' "$msg" |
                git commit-tree $i_tree -p $b_commit) ||
                die "Cannot save the current index state"
 
@@ -157,15 +157,16 @@ apply_stash () {
        if git-merge-recursive $b_tree -- $c_tree $w_tree
        then
                # No conflict
-               a="$TMP-added" &&
-               git diff --cached --name-only --diff-filter=A $c_tree >"$a" &&
-               git read-tree --reset $c_tree &&
-               git update-index --add --stdin <"$a" ||
-                       die "Cannot unstage modified files"
-               rm -f "$a"
                if test -n "$unstashed_index_tree"
                then
                        git read-tree "$unstashed_index_tree"
+               else
+                       a="$TMP-added" &&
+                       git diff --cached --name-only --diff-filter=A $c_tree >"$a" &&
+                       git read-tree --reset $c_tree &&
+                       git update-index --add --stdin <"$a" ||
+                               die "Cannot unstage modified files"
+                       rm -f "$a"
                fi
                git status || :
        else