http-fetch: don't use double-slash as directory separator in URLs

diff --git a/git-merge.sh b/git-merge.sh
index 8759c5a7e0f8748108d6eff005cde1e0893f3592..fa4589173f426d6172883c47479c52b8700cafa8 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -108,6 +108,10 @@ merge_name () {
                git-show-ref -q --verify "refs/heads/$truname" 2>/dev/null
        then
                echo "$rh               branch '$truname' (early part) of ."
+       elif test "$remote" = "FETCH_HEAD" -a -r "$GIT_DIR/FETCH_HEAD"
+       then
+               sed -e 's/      not-for-merge   /               /' -e 1q \
+                       "$GIT_DIR/FETCH_HEAD"
        else
                echo "$rh               commit '$remote'"
        fi