From: Santi Béjar <sbejar@gmail.com>
Date: Sun, 18 Mar 2007 23:16:23 +0000 (+0100)
Subject: git-fetch: Fix single_force in append_fetch_head
X-Git-Tag: v1.5.1-rc2~49
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=08727ea8bba8c81678e5cf15124ada23ad097bc3;p=git.git

git-fetch: Fix single_force in append_fetch_head

This fixes the single force (+) when fetched with fetch_per_ref.

Also use $LF as separator because IFS is $LF.

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-fetch.sh b/git-fetch.sh
index e21804284..93349330d 100755
--- 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 "$@"
 }