Skip to main content

Browse the archive

Revision 0e8c09263e87c548de006cdb6af035d42f845087 authored by Junio C Hamano on 25 March 2014, 18:08:19 UTC, committed by Junio C Hamano on 25 March 2014, 18:08:19 UTC 
Merge branch 'nd/index-pack-error-message'
 
* nd/index-pack-error-message:
  index-pack: report error using the correct variable
2 parent s 66d9133 + de983a0
Raw File
t4039-diff-assume-unchanged.sh 
#!/bin/sh

test_description='diff with assume-unchanged entries'

. ./test-lib.sh

# external diff has been tested in t4020-diff-external.sh

test_expect_success 'setup' '
	echo zero > zero &&
	git add zero &&
	git commit -m zero &&
	echo one > one &&
	echo two > two &&
	git add one two &&
	git commit -m onetwo &&
	git update-index --assume-unchanged one &&
	echo borked >> one &&
	test "$(git ls-files -v one)" = "h one"
'

test_expect_success 'diff-index does not examine assume-unchanged entries' '
	git diff-index HEAD^ -- one | grep -q 5626abf0f72e58d7a153368ba57db4c673c0e171
'

test_expect_success 'diff-files does not examine assume-unchanged entries' '
	rm one &&
	test -z "$(git diff-files -- one)"
'

test_done
back to top