Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: [PATCH] pull: fix 'git pull --all' when current branch is tracking remote that is not last in the list of remotes

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:48:20

Michael Lukashov [off-list ref] writes:
quoted hunk
diff --git a/git-pull.sh b/git-pull.sh
index 38331a8..fcde096 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -214,7 +214,11 @@ test true = "$rebase" && {
 	done
 }
 orig_head=$(git rev-parse -q --verify HEAD)
-git fetch $verbosity --update-head-ok "$@" || exit 1
+if test -e "$GIT_DIR"/FETCH_HEAD
+then
+	rm "$GIT_DIR"/FETCH_HEAD 2>/dev/null
+fi
When is it sane to ignore an error from this "rm", especially after you
made sure that it exists?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help