diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-05 23:58:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-05 23:58:42 -0800 |
| commit | e27d620e919f524ee0bfa0a4d1f35225d3cb867e (patch) | |
| tree | d34c5ac6e921059fd3904ebbdb666da863ec0e5e /t | |
| parent | 4802997c7531835f16b6fce690854d9a75119d0b (diff) | |
| parent | 36ed1913e1d5de0930e59db6eeec3ccb2bd58bd9 (diff) | |
| download | git-e27d620e919f524ee0bfa0a4d1f35225d3cb867e.tar.gz | |
Merge branch 'jc/maint-log-first-parent-pathspec' into maint
* 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 af34a1e817..839ad97b79 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 |