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
t0101-at-syntax.sh 
#!/bin/sh

test_description='various @{whatever} syntax tests'
. ./test-lib.sh

test_expect_success 'setup' '
	test_commit one &&
	test_commit two
'

check_at() {
	echo "$2" >expect &&
	git log -1 --format=%s "$1" >actual &&
	test_cmp expect actual
}

test_expect_success '@{0} shows current' '
	check_at @{0} two
'

test_expect_success '@{1} shows old' '
	check_at @{1} one
'

test_expect_success '@{now} shows current' '
	check_at @{now} two
'

test_expect_success '@{2001-09-17} (before the first commit) shows old' '
	check_at @{2001-09-17} one
'

test_expect_success 'silly approxidates work' '
	check_at @{3.hot.dogs.on.2001-09-17} one
'

test_expect_success 'notice misspelled upstream' '
	test_must_fail git log -1 --format=%s @{usptream}
'

test_expect_success 'complain about total nonsense' '
	test_must_fail git log -1 --format=%s @{utter.bogosity}
'

test_done
back to top