diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-09-27 01:39:45 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-09-27 01:39:45 +0400 |
commit | 5500095ff4d322001ce81ce4b365086bcd4612aa (patch) | |
tree | de1da22110596ad60f8e4bcdab14f4e95f3c5a1d /t | |
parent | 1c2ea2cdc0e8c4e5af942c51b234c5af527944f6 (diff) | |
parent | 8376a704419813c9af1d056cbd36b9ff6744c8bc (diff) |
Merge branch 'jk/branch-verbose-merged'
The "--verbose" option no longer breaks "git branch --merged $it".
* jk/branch-verbose-merged:
branch: clean up commit flags after merge-filter walk
Diffstat (limited to 't')
-rwxr-xr-x | t/t3201-branch-contains.sh | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh index 141b0611ea..912a6635a8 100755 --- a/t/t3201-branch-contains.sh +++ b/t/t3201-branch-contains.sh @@ -130,4 +130,33 @@ test_expect_success 'implicit --list conflicts with modification options' ' ' +# We want to set up a case where the walk for the tracking info +# of one branch crosses the tip of another branch (and make sure +# that the latter walk does not mess up our flag to see if it was +# merged). +# +# Here "topic" tracks "master" with one extra commit, and "zzz" points to the +# same tip as master The name "zzz" must come alphabetically after "topic" +# as we process them in that order. +test_expect_success 'branch --merged with --verbose' ' + git branch --track topic master && + git branch zzz topic && + git checkout topic && + test_commit foo && + git branch --merged topic >actual && + cat >expect <<-\EOF && + master + * topic + zzz + EOF + test_cmp expect actual && + git branch --verbose --merged topic >actual && + cat >expect <<-\EOF && + master c77a0a9 second on master + * topic 2c939f4 [ahead 1] foo + zzz c77a0a9 second on master + EOF + test_cmp expect actual +' + test_done |