Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Jan 17, 2014
2 parents 14598b9 + ffc2b48 commit d8cf714
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-pull.sh
Expand Up @@ -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
Expand Down

0 comments on commit d8cf714

Please sign in to comment.