X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=git-pull.sh;h=266e682f6c518ab72dc710d52ed4f1dbe22881b5;hb=d2216a4b133f90a543a0e4c4a9f9809a043012d6;hp=2a10047eb710011213024bd0acc57eec87a6f965;hpb=3424da1118786209f7ac41dd273e72a081421cd3;p=git.git diff --git a/git-pull.sh b/git-pull.sh index 2a10047eb..266e682f6 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -200,6 +200,7 @@ test true = "$rebase" && { require_clean_work_tree "pull with rebase" "Please commit or stash them." fi oldremoteref= && + test -n "$curr_branch" && . git-parse-remote && remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" && oldremoteref="$(git rev-parse -q --verify "$remoteref")" &&