diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-19 07:45:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 07:45:28 (GMT) |
| commit | 4ac8371a1ce0df07a2c3389d6acf6c35207a54fa (patch) | |
| tree | 0570de778821f4b158c6d7287843b906d68c5b33 /t/t3200-branch.sh | |
| parent | 3c9b393ca8fdb4db53e461a6f506dd10ed6fbc85 (diff) | |
| parent | e3d6539d58238f046ff955330f6e10c447150164 (diff) | |
| download | git-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 't/t3200-branch.sh')
| -rwxr-xr-x | t/t3200-branch.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index e9ad50b..e9d7084 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -42,6 +42,10 @@ test_expect_success 'git branch a/b/c should create a branch' ' git branch a/b/c && test_path_is_file .git/refs/heads/a/b/c ' +test_expect_success 'git branch mb master... should create a branch' ' + git branch mb master... && test_path_is_file .git/refs/heads/mb +' + test_expect_success 'git branch HEAD should fail' ' test_must_fail git branch HEAD ' @@ -316,8 +320,8 @@ test_expect_success 'git branch --list -v with --abbrev' ' test_expect_success 'git branch --column' ' COLUMNS=81 git branch --column=column >actual && cat >expected <<\EOF && - a/b/c bam foo l * master n o/p r - abc bar j/k m/m master2 o/o q + a/b/c bam foo l * master mb o/o q + abc bar j/k m/m master2 n o/p r EOF test_cmp expected actual ' @@ -339,6 +343,7 @@ test_expect_success 'git branch --column with an extremely long branch name' ' m/m * master master2 + mb n o/o o/p @@ -356,8 +361,8 @@ test_expect_success 'git branch with column.*' ' git config --unset column.branch && git config --unset column.ui && cat >expected <<\EOF && - a/b/c bam foo l * master n o/p r - abc bar j/k m/m master2 o/o q + a/b/c bam foo l * master mb o/o q + abc bar j/k m/m master2 n o/p r EOF test_cmp expected actual ' @@ -381,6 +386,7 @@ test_expect_success 'git branch -v with column.ui ignored' ' m/m * master master2 + mb n o/o o/p |