summaryrefslogtreecommitdiff
path: root/branch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-05-19 07:45:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-19 07:45:28 (GMT)
commit4ac8371a1ce0df07a2c3389d6acf6c35207a54fa (patch)
tree0570de778821f4b158c6d7287843b906d68c5b33 /branch.c
parent3c9b393ca8fdb4db53e461a6f506dd10ed6fbc85 (diff)
parente3d6539d58238f046ff955330f6e10c447150164 (diff)
downloadgit-4ac8371a1ce0df07a2c3389d6acf6c35207a54fa.zip
git-4ac8371a1ce0df07a2c3389d6acf6c35207a54fa.tar.gz
git-4ac8371a1ce0df07a2c3389d6acf6c35207a54fa.tar.bz2
Merge branch 'dl/branch-from-3dot-merge-base'
"git branch new A...B" and "git checkout -b new A...B" have been taught that in their contexts, the notation A...B means "the merge base between these two commits", just like "git checkout A...B" detaches HEAD at that commit. * dl/branch-from-3dot-merge-base: branch: make create_branch accept a merge base rev t2018: cleanup in current test
Diffstat (limited to 'branch.c')
-rw-r--r--branch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/branch.c b/branch.c
index 6436945..a594cc2 100644
--- a/branch.c
+++ b/branch.c
@@ -269,7 +269,7 @@ void create_branch(struct repository *r,
}
real_ref = NULL;
- if (get_oid(start_name, &oid)) {
+ if (get_oid_mb(start_name, &oid)) {
if (explicit_tracking) {
if (advice_set_upstream_failure) {
error(_(upstream_missing), start_name);