ls-files: --others should not say unmerged paths are unknown.

diff --git a/git-fetch.sh b/git-fetch.sh
index 0cb1596f50c998ba1f4ac0e2049e1c18459fc5a8..31e5f4c7225df3d279b78f67ebd0f7a8c87ede40 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -114,7 +114,12 @@ fast_forward_local () {
        # is no way to guarantee "fast-forward" anyway.
        if test -f "$GIT_DIR/$1"
        then
-               echo >&2 "* $1: updating with $3"
+               if now_=$(cat "$GIT_DIR/$1") && test "$now_" = "$2"
+               then
+                       echo >&2 "* $1: same as $3"
+               else
+                       echo >&2 "* $1: updating with $3"
+               fi
        else
                echo >&2 "* $1: storing $3"
        fi
@@ -176,7 +181,7 @@ if test "$tags"
 then
        taglist=$(git-ls-remote --tags "$remote" |
                sed -e '
-                       /\^{}$/d
+                       /\^/d
                        s/^[^   ]*      //
                        s/.*/&:&/')
        if test "$#" -gt 1