author | Junio C Hamano <gitster@pobox.com> | |
Tue, 6 Mar 2012 22:53:02 +0000 (14:53 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 6 Mar 2012 22:53:02 +0000 (14:53 -0800) |
By Thomas Rast
* maint:
t5704: fix nonportable sed/grep usages
Document the --histogram diff option
* maint:
t5704: fix nonportable sed/grep usages
Document the --histogram diff option
Documentation/diff-options.txt | patch | blob | history | |
t/t5704-bundle.sh | patch | blob | history |
index 9f7cba2be6a97cb85072d22b3317d37d1afe80bf..ba7cd13483194399762b0f48e218ddb4011dfcf1 100644 (file)
--patience::
Generate a diff using the "patience diff" algorithm.
+--histogram::
+ Generate a diff using the "histogram diff" algorithm.
+
--stat[=<width>[,<name-width>[,<count>]]]::
Generate a diffstat. You can override the default
output width for 80-column terminal by `--stat=<width>`.
diff --git a/t/t5704-bundle.sh b/t/t5704-bundle.sh
index a51c8b0560f85d31dc73d40a58ae3e4c6655f140..9e43731fe504c46737c5294e4d508b5c20bbb663 100755 (executable)
--- a/t/t5704-bundle.sh
+++ b/t/t5704-bundle.sh
git bundle list-heads long-subject-bundle.bdl >heads &&
test -s heads &&
git fetch long-subject-bundle.bdl &&
- sed -n "/^-/{p;q}" long-subject-bundle.bdl >boundary &&
- grep "^-$_x40 " boundary
+ sed -n "/^-/{p;q;}" long-subject-bundle.bdl >boundary &&
+ grep "^-[0-9a-f]\\{40\\} " boundary
'
test_done