t3903-stash.sh: Add tests for new stash commands drop and pop

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 5587c5ecea0f6a97f2715636890c9e2f89845d52..cbbb707959cc64427f7bbd7bfefb0a8f0f263596 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -152,10 +152,11 @@ merge_file () {
        exit 1
     fi
 
-    BACKUP="$path.BACKUP.$$"
-    LOCAL="$path.LOCAL.$$"
-    REMOTE="$path.REMOTE.$$"
-    BASE="$path.BASE.$$"
+    ext="$$$(expr "$path" : '.*\(\.[^/]*\)$')"
+    BACKUP="$path.BACKUP.$ext"
+    LOCAL="$path.LOCAL.$ext"
+    REMOTE="$path.REMOTE.$ext"
+    BASE="$path.BASE.$ext"
 
     mv -- "$path" "$BACKUP"
     cp -- "$BACKUP" "$path"
@@ -392,8 +393,11 @@ if test $# -eq 0 ; then
                echo "No files need merging"
                exit 0
        fi
-       echo Merging the files: $files
-       git ls-files -u | sed -e 's/^[^ ]*      //' | sort -u | while read i
+       echo Merging the files: "$files"
+       git ls-files -u |
+       sed -e 's/^[^   ]*      //' |
+       sort -u |
+       while IFS= read i
        do
                printf "\n"
                merge_file "$i" < /dev/tty > /dev/tty