зеркало из https://github.com/microsoft/git.git
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
This commit is contained in:
Коммит
d8cf714c0e
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче