diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-11-04 00:12:55 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-04 00:12:57 +0100 |
| commit | 415095f05501bb17edcb86c6d9fd193753b30ea7 (patch) | |
| tree | ef453673dd4ada7c2b0b355085d8c3086f619a3a /t/t3203-branch-output.sh | |
| parent | Ninth batch for 2.7 (diff) | |
| parent | ref-filter: fallback on alphabetical comparison (diff) | |
| download | git-415095f05501bb17edcb86c6d9fd193753b30ea7.tar.xz git-415095f05501bb17edcb86c6d9fd193753b30ea7.zip | |
Merge branch 'kn/for-each-branch'
Using the timestamp based criteria in "git branch --sort" did not
tiebreak branches that point at commits with the same timestamp (or
the same commit), making the resulting output unstable.
* kn/for-each-branch:
ref-filter: fallback on alphabetical comparison
Diffstat (limited to 't/t3203-branch-output.sh')
| -rwxr-xr-x | t/t3203-branch-output.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh index 9454423ca0..d3913f9088 100755 --- a/t/t3203-branch-output.sh +++ b/t/t3203-branch-output.sh @@ -158,8 +158,8 @@ EOF test_expect_success 'git branch `--sort` option' ' cat >expect <<-\EOF && - branch-two * (HEAD detached from fromtag) + branch-two branch-one master EOF |