gitweb: Lift any characters restriction on searched strings

[git.git] / git-stash.sh

diff --git a/git-stash.sh b/git-stash.sh
index 873e7be6ad1f1906546f13fb59f624e2f4e37ae2..30425ce6df8b8da9b105fa7d8e958936420983ed 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -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