From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Jan 2014 20:04:29 +0000 (-0800)
Subject: Merge branch 'jk/pull-rebase-using-fork-point'
X-Git-Tag: v1.9-rc0~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d8cf714c0edf261a2bcc126fc240b10ed04a5b8d?hp=-c

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

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
---

d8cf714c0edf261a2bcc126fc240b10ed04a5b8d
diff --combined git-pull.sh
index f210d0a147,11ac50552c..0a5aa2c821
--- a/git-pull.sh
+++ b/git-pull.sh
@@@ -172,7 -172,7 +172,7 @@@ error_on_no_merge_candidates () 
  	do
  		case "$opt" in
  		-t|--t|--ta|--tag|--tags)
 -			echo "Fetching tags only, you probably meant:"
 +			echo "It doesn't make sense to pull all tags; you probably meant:"
  			echo "  git fetch --tags"
  			exit 1
  		esac
@@@ -229,7 -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