gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patches

[git.git] / git-fetch.sh

diff --git a/git-fetch.sh b/git-fetch.sh
index e21804284398016a789b415dec9332700d33f8e6..fd70696b7479ad08eedbb44b75654f07247cc37b 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -110,8 +110,8 @@ ls_remote_result=$(git ls-remote $exec "$remote") ||
 
 append_fetch_head () {
        flags=
-       test -n "$verbose" && flags="$flags -v"
-       test -n "$force" && flags="$flags -f"
+       test -n "$verbose" && flags="$flags$LF-v"
+       test -n "$force$single_force" && flags="$flags$LF-f"
        GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION" \
                git-fetch--tool $flags append-fetch-head "$@"
 }
@@ -248,7 +248,7 @@ fetch_per_ref () {
          expr "z$head" : "z$_x40\$" >/dev/null ||
                die "No such ref $remote_name at $remote"
          echo >&2 "Fetching $remote_name from $remote using $proto"
-         git-http-fetch -v -a "$head" "$remote/" || exit
+         git-http-fetch -v -a "$head" "$remote" || exit
          ;;
       rsync://*)
          test -n "$shallow_depth" &&