global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-18 20:50:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  config.txt: fix placement of diff.noprefix
  t/t4018: avoid two unnecessary sub-shell invocations
This commit is contained in:
Junio C Hamano
2010-09-10 09:39:14 -07:00
parent a815a0fd47 9ab5a338fc
commit d59f2a298c
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/config.txt
View File

@@ -813,8 +813,6 @@ diff.mnemonicprefix::
standard "a/" and "b/" depending on what is being compared. When
this configuration is in effect, reverse diff output also swaps
the order of the prefixes:
diff.noprefix::
If set, 'git diff' does not show any source or destination prefix.
`git diff`;;
compares the (i)ndex and the (w)ork tree;
`git diff HEAD`;;
@@ -826,6 +824,9 @@ diff.noprefix::
`git diff --no-index a b`;;
compares two non-git things (1) and (2).
diff.noprefix::
If set, 'git diff' does not show any source or destination prefix.
diff.renameLimit::
The number of files to consider when performing the copy/rename
detection; equivalent to the 'git diff' option '-l'.

8
t/t4018-diff-funcname.sh
View File

@@ -37,13 +37,13 @@ for p in $builtin_patterns
do
test_expect_success "builtin $p pattern compiles" '
echo "*.java diff=$p" > .gitattributes &&
! ( git diff --no-index Beer.java Beer-correct.java 2>&1 |
grep "fatal" > /dev/null )
! { git diff --no-index Beer.java Beer-correct.java 2>&1 |
grep "fatal" > /dev/null; }
'
test_expect_success "builtin $p wordRegex pattern compiles" '
! ( git diff --no-index --word-diff \
! { git diff --no-index --word-diff \
Beer.java Beer-correct.java 2>&1 |
grep "fatal" > /dev/null )
grep "fatal" > /dev/null; }
'
done