apply: check D/F conflicts more carefully.

diff --git a/git-fetch.sh b/git-fetch.sh
index ff1769952b704d3ee3123395274da76e8f09a373..ee99280a2ab3abdcc340d66661747968a60c84ec 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -153,7 +153,7 @@ fast_forward_local () {
        then
                if now_=$(cat "$GIT_DIR/$1") && test "$now_" = "$2"
                then
-                       [ "$verbose" ] && echo >&2 "* $1: same as $3"
+                       [ "$verbose" ] && echo >&2 "* $1: same as $3" ||:
                else
                        echo >&2 "* $1: updating with $3"
                        git-update-ref -m "$rloga: updating tag" "$1" "$2"