diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-10 01:21:00 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-10 01:21:00 +0300 |
| commit | d9976b184596e499e6ce5e0a61d17ef688d1e247 (patch) | |
| tree | a842b2a7ea1b892594972e0a1c98527f5b7edef1 /t/t4202-log.sh | |
| parent | 472a219f8daa522157886979ec954d4730755db1 (diff) | |
| parent | a2585719b347b57a4fb61a4ed24301cfa3cf19a7 (diff) | |
Merge branch 'jc/name-rev-stdin'
"git name-rev --stdin" does not behave like usual "--stdin" at
all. Start the process of renaming it to "--annotate-stdin".
* jc/name-rev-stdin:
name-rev.c: use strbuf_getline instead of limited size buffer
name-rev: deprecate --stdin in favor of --annotate-stdin
Diffstat (limited to 't/t4202-log.sh')
| -rwxr-xr-x | t/t4202-log.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 5049559861..dc884107de 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -659,7 +659,7 @@ EOF test_expect_success 'log --graph with full output' ' git log --graph --date-order --pretty=short | - git name-rev --name-only --stdin | + git name-rev --name-only --annotate-stdin | sed "s/Merge:.*/Merge: A B/;s/ *\$//" >actual && test_cmp expect actual ' |