Skip to main content

Browse the archive

Revision 80ffb7570f86fb8b671048a374f3c7990c45a27f authored by Junio C Hamano on 30 July 2012, 20:03:40 UTC, committed by Junio C Hamano on 30 July 2012, 20:04:18 UTC 
Merge branch 'jc/maint-filter-branch-epoch-date' into maint
 
In 1.7.9 era, we taught "git rebase" about the raw timestamp format
but we did not teach the same trick to "filter-branch", which rolled
a similar logic on its own.

* jc/maint-filter-branch-epoch-date:
  t7003: add test to filter a branch with a commit at epoch
  date.c: Fix off by one error in object-header date parsing
  filter-branch: do not forget the '@' prefix to force git-timestamp
2 parent s e6dfbcf + 44b85e8
Raw File
t7103-reset-bare.sh 
#!/bin/sh

test_description='git reset in a bare repository'
. ./test-lib.sh

test_expect_success 'setup non-bare' '
	echo one >file &&
	git add file &&
	git commit -m one &&
	echo two >file &&
	git commit -a -m two
'

test_expect_success '"hard" reset requires a worktree' '
	(cd .git &&
	 test_must_fail git reset --hard)
'

test_expect_success '"merge" reset requires a worktree' '
	(cd .git &&
	 test_must_fail git reset --merge)
'

test_expect_success '"keep" reset requires a worktree' '
	(cd .git &&
	 test_must_fail git reset --keep)
'

test_expect_success '"mixed" reset is ok' '
	(cd .git && git reset)
'

test_expect_success '"soft" reset is ok' '
	(cd .git && git reset --soft)
'

test_expect_success 'hard reset works with GIT_WORK_TREE' '
	mkdir worktree &&
	GIT_WORK_TREE=$PWD/worktree GIT_DIR=$PWD/.git git reset --hard &&
	test_cmp file worktree/file
'

test_expect_success 'setup bare' '
	git clone --bare . bare.git &&
	cd bare.git
'

test_expect_success '"hard" reset is not allowed in bare' '
	test_must_fail git reset --hard HEAD^
'

test_expect_success '"merge" reset is not allowed in bare' '
	test_must_fail git reset --merge HEAD^
'

test_expect_success '"keep" reset is not allowed in bare' '
	test_must_fail git reset --keep HEAD^
'

test_expect_success '"mixed" reset is not allowed in bare' '
	test_must_fail git reset --mixed HEAD^
'

test_expect_success '"soft" reset is allowed in bare' '
	git reset --soft HEAD^ &&
	test "`git show --pretty=format:%s | head -n 1`" = "one"
'

test_done
back to top