Merge branch 'jk/pull-rebase-using-fork-point'

gitster · gitster · commit d8cf714c0edf · 2014-01-17T12:04:29.000-08:00
Finishing touches so that an expected error message will not leak to
the UI.

* jk/pull-rebase-using-fork-point:
  pull: suppress error when no remoteref is found
diff --git a/git-pull.sh b/git-pull.sh
@@ -229,7 +229,7 @@ test true = "$rebase" && {
 	test -n "$curr_branch" &&
 	. git-parse-remote &&
 	remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" &&
-	oldremoteref=$(git merge-base --fork-point "$remoteref" $curr_branch)
+	oldremoteref=$(git merge-base --fork-point "$remoteref" $curr_branch 2>/dev/null)
 }
 orig_head=$(git rev-parse -q --verify HEAD)
 git fetch $verbosity $progress $dry_run $recurse_submodules --update-head-ok "$@" || exit 1

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ test true = "$rebase" && {`
`229`	`229`	`test -n "$curr_branch" &&`
`230`	`230`	`. git-parse-remote &&`
`231`	`231`	`remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" &&`
`232`		`- oldremoteref=$(git merge-base --fork-point "$remoteref" $curr_branch)`
	`232`	`+ oldremoteref=$(git merge-base --fork-point "$remoteref" $curr_branch 2>/dev/null)`
`233`	`233`	`}`
`234`	`234`	`orig_head=$(git rev-parse -q --verify HEAD)`
`235`	`235`	`git fetch $verbosity $progress $dry_run $recurse_submodules --update-head-ok "$@" \|\| exit 1`