diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-01-29 13:18:54 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-01-29 13:18:54 -0800 |
commit | 731218c18f493cc6c6e3fc22be837e49e5399768 (patch) | |
tree | 87e9210c371e9ac917c83e3e2387dab4e4ac9190 /t | |
parent | a734e7ef6c14d8eb476fe8b2d6f861b3ed2c211d (diff) | |
parent | 36ed1913e1d5de0930e59db6eeec3ccb2bd58bd9 (diff) | |
download | git-731218c18f493cc6c6e3fc22be837e49e5399768.tar.gz git-731218c18f493cc6c6e3fc22be837e49e5399768.tar.xz |
Merge branch 'jc/maint-log-first-parent-pathspec'
* jc/maint-log-first-parent-pathspec:
Making pathspec limited log play nicer with --first-parent
Diffstat (limited to 't')
-rwxr-xr-x | t/t6012-rev-list-simplify.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh index af34a1e81..839ad97b7 100755 --- a/t/t6012-rev-list-simplify.sh +++ b/t/t6012-rev-list-simplify.sh @@ -86,5 +86,6 @@ check_result 'I H E C B A' --full-history --date-order -- file check_result 'I E C B A' --simplify-merges -- file check_result 'I B A' -- file check_result 'I B A' --topo-order -- file +check_result 'H' --first-parent -- another-file test_done |