undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
By Thomas Rast
* maint:
  t5704: fix nonportable sed/grep usages
  Document the --histogram diff option
This commit is contained in:
Junio C Hamano 2012-03-06 14:53:02 -08:00
commit 556c5e030f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/diff-options.txt
View File

@ -52,6 +52,9 @@ endif::git-format-patch[]
--patience:: --patience::
Generate a diff using the "patience diff" algorithm. Generate a diff using the "patience diff" algorithm.
--histogram::
Generate a diff using the "histogram diff" algorithm.
--stat[=<width>[,<name-width>[,<count>]]]:: --stat[=<width>[,<name-width>[,<count>]]]::
Generate a diffstat. You can override the default Generate a diffstat. You can override the default
output width for 80-column terminal by `--stat=<width>`. output width for 80-column terminal by `--stat=<width>`.

4
t/t5704-bundle.sh
View File

@ -54,8 +54,8 @@ test_expect_success 'ridiculously long subject in boundary' '
git bundle list-heads long-subject-bundle.bdl >heads && git bundle list-heads long-subject-bundle.bdl >heads &&
test -s heads && test -s heads &&
git fetch long-subject-bundle.bdl && git fetch long-subject-bundle.bdl &&
sed -n "/^-/{p;q}" long-subject-bundle.bdl >boundary && sed -n "/^-/{p;q;}" long-subject-bundle.bdl >boundary &&
grep "^-$_x40 " boundary grep "^-[0-9a-f]\\{40\\} " boundary
' '
test_done test_done