Revision 8c8b3bc3f4e859be0af49f91e0d1831a9ae50324 authored by Jeff King on 26 July 2012, 20:32:50 UTC, committed by Junio C Hamano on 26 July 2012, 21:23:35 UTC
In commit f20f387, "git commit" notices and dies much
earlier when we have a bogus commit identity. That commit
did not add a test because we cannot do so reliably (namely,
we can only trigger the behavior on a system where the
automatically generated identity is bogus). However, now
that we have a prerequisite check for this feature, we can
add a test that will at least run on systems that produce
such a bogus identity.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 1d7dc26
Raw File
t4126-apply-empty.sh
#!/bin/sh

test_description='apply empty'

. ./test-lib.sh

test_expect_success setup '
	>empty &&
	git add empty &&
	test_tick &&
	git commit -m initial &&
	for i in a b c d e
	do
		echo $i
	done >empty &&
	cat empty >expect &&
	git diff |
	sed -e "/^diff --git/d" \
	    -e "/^index /d" \
	    -e "s|a/empty|empty.orig|" \
	    -e "s|b/empty|empty|" >patch0 &&
	sed -e "s|empty|missing|" patch0 >patch1 &&
	>empty &&
	git update-index --refresh
'

test_expect_success 'apply empty' '
	git reset --hard &&
	rm -f missing &&
	git apply patch0 &&
	test_cmp expect empty
'

test_expect_success 'apply --index empty' '
	git reset --hard &&
	rm -f missing &&
	git apply --index patch0 &&
	test_cmp expect empty &&
	git diff --exit-code
'

test_expect_success 'apply create' '
	git reset --hard &&
	rm -f missing &&
	git apply patch1 &&
	test_cmp expect missing
'

test_expect_success 'apply --index create' '
	git reset --hard &&
	rm -f missing &&
	git apply --index patch1 &&
	test_cmp expect missing &&
	git diff --exit-code
'

test_done
back to top