Staging
v0.5.1
Revision 297ca895a27a6bbdb7906371d533f72a12ad25b2 authored by Junio C Hamano on 20 January 2022, 23:25:38 UTC, committed by Junio C Hamano on 20 January 2022, 23:25:38 UTC
"git branch -h" incorrectly said "--track[=direct|inherit]",
implying that "--trackinherit" is a valid option, which has been
corrected.
source: <3de40324bea6a1dd9bca2654721471e3809e87d8.1642538935.git.steadmon@google.com>
source: <c3c26192-aee9-185a-e559-b8735139e49c@web.de>

* js/branch-track-inherit:
  branch,checkout: fix --track documentation
2 parent s 50b2d72 + 6327f0e
Raw File
t4126-apply-empty.sh
#!/bin/sh

test_description='apply empty'


TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh

test_expect_success setup '
	>empty &&
	git add empty &&
	test_tick &&
	git commit -m initial &&
	git commit --allow-empty -m "empty commit" &&
	git format-patch --always HEAD~ >empty.patch &&
	test_write_lines a b c d e >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' '
	rm -f missing &&
	test_when_finished "git reset --hard" &&
	git apply patch0 &&
	test_cmp expect empty
'

test_expect_success 'apply empty patch fails' '
	test_when_finished "git reset --hard" &&
	test_must_fail git apply empty.patch &&
	test_must_fail git apply - </dev/null
'

test_expect_success 'apply with --allow-empty succeeds' '
	test_when_finished "git reset --hard" &&
	git apply --allow-empty empty.patch &&
	git apply --allow-empty - </dev/null
'

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

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

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

test_done
back to top