diff options
| author |  Mike Crowe <mac@mcrowe.com> | 2013-05-17 21:56:18 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-05-20 11:09:03 -0700 |
| commit | e00dd1e9485c50f202cc97dfae19d510e108b565 (patch) | |
| tree | e0ff1428e746e363c93ee9a5303e347c7aced797 /t | |
| parent | Git 1.8.3-rc3 (diff) | |
| download | tgif-e00dd1e9485c50f202cc97dfae19d510e108b565.tar.xz | |
describe: Add --first-parent option
Only consider the first parent commit when walking the commit history. This
is useful if you only wish to match tags on your branch after a merge.
Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6120-describe.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index f67aa6ff6a..a25729f2a7 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -110,6 +110,9 @@ check_describe tags/e --all HEAD^^^ check_describe B-0-* --long HEAD^^2^ check_describe A-3-* --long HEAD^^2 +check_describe c-7-* --tags +check_describe e-3-* --first-parent --tags + : >err.expect check_describe A --all A^0 test_expect_success 'no warning was displayed for A' ' |