Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
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 
Merge branch 'js/branch-track-inherit'
 
"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
Tip revision: 297ca895a27a6bbdb7906371d533f72a12ad25b2 authored by Junio C Hamano on 20 January 2022, 23:25:38 UTC
Merge branch 'js/branch-track-inherit'
Tip revision: 297ca89
t7525-status-rename.sh 
#!/bin/sh

test_description='git status rename detection options'

TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh

test_expect_success 'setup' '
	echo 1 >original &&
	git add . &&
	git commit -m"Adding original file." &&
	mv original renamed &&
	echo 2 >> renamed &&
	git add . &&
	cat >.gitignore <<-\EOF
	.gitignore
	expect*
	actual*
	EOF
'

test_expect_success 'status no-options' '
	git status >actual &&
	test_i18ngrep "renamed:" actual
'

test_expect_success 'status --no-renames' '
	git status --no-renames >actual &&
	test_i18ngrep "deleted:" actual &&
	test_i18ngrep "new file:" actual
'

test_expect_success 'status.renames inherits from diff.renames false' '
	git -c diff.renames=false status >actual &&
	test_i18ngrep "deleted:" actual &&
	test_i18ngrep "new file:" actual
'

test_expect_success 'status.renames inherits from diff.renames true' '
	git -c diff.renames=true status >actual &&
	test_i18ngrep "renamed:" actual
'

test_expect_success 'status.renames overrides diff.renames false' '
	git -c diff.renames=true -c status.renames=false status >actual &&
	test_i18ngrep "deleted:" actual &&
	test_i18ngrep "new file:" actual
'

test_expect_success 'status.renames overrides from diff.renames true' '
	git -c diff.renames=false -c status.renames=true status >actual &&
	test_i18ngrep "renamed:" actual
'

test_expect_success 'status status.renames=false' '
	git -c status.renames=false status >actual &&
	test_i18ngrep "deleted:" actual &&
	test_i18ngrep "new file:" actual
'

test_expect_success 'status status.renames=true' '
	git -c status.renames=true status >actual &&
	test_i18ngrep "renamed:" actual
'

test_expect_success 'commit honors status.renames=false' '
	git -c status.renames=false commit --dry-run >actual &&
	test_i18ngrep "deleted:" actual &&
	test_i18ngrep "new file:" actual
'

test_expect_success 'commit honors status.renames=true' '
	git -c status.renames=true commit --dry-run >actual &&
	test_i18ngrep "renamed:" actual
'

test_expect_success 'status config overridden' '
	git -c status.renames=true status --no-renames >actual &&
	test_i18ngrep "deleted:" actual &&
	test_i18ngrep "new file:" actual
'

test_expect_success 'status score=100%' '
	git status -M=100% >actual &&
	test_i18ngrep "deleted:" actual &&
	test_i18ngrep "new file:" actual &&

	git status --find-renames=100% >actual &&
	test_i18ngrep "deleted:" actual &&
	test_i18ngrep "new file:" actual
'

test_expect_success 'status score=01%' '
	git status -M=01% >actual &&
	test_i18ngrep "renamed:" actual &&

	git status --find-renames=01% >actual &&
	test_i18ngrep "renamed:" actual
'

test_expect_success 'copies not overridden by find-renames' '
	cp renamed copy &&
	git add copy &&

	git -c status.renames=copies status -M=01% >actual &&
	test_i18ngrep "copied:" actual &&
	test_i18ngrep "renamed:" actual &&

	git -c status.renames=copies status --find-renames=01% >actual &&
	test_i18ngrep "copied:" actual &&
	test_i18ngrep "renamed:" actual
'

test_done
back to top