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

Merge branch 'mp/t7060-diff-index-test'

Browse Source 
Fix an old test that was doing the same thing as another one.

* mp/t7060-diff-index-test:
  t7060: actually test "git diff-index --cached -M"
This commit is contained in:
Junio C Hamano 2015-09-14 11:46:28 -07:00
commit 971f9ea543
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t7060-wtstatus.sh
View File

@ -106,7 +106,7 @@ test_expect_success 'git diff-index --cached -M shows 2 added + 1 unmerged' '
A THREE A THREE
A TWO A TWO
EOF EOF
git diff-index --cached --name-status HEAD >actual && git diff-index --cached -M --name-status HEAD >actual &&
test_cmp expected actual test_cmp expected actual
' '