 5135d1c3d2
			
		
	
	5135d1c3d2
	
	
	
		
			
			d95138e6(setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR, 2015-06-26) attempted to work around a glitch in alias handling by overwriting GIT_WORK_TREE environment variable to affect subprocesses when set_git_work_tree() gets called, which resulted in a rather unpleasant regression to "clone" and "init". Try to address the same issue by always restoring the environment and respawning the real underlying command when handling alias. * nd/clear-gitenv-upon-use-of-alias: run-command: don't warn on SIGPIPE deaths git.c: make sure we do not leak GIT_* to alias scripts setup.c: re-fixd95138e(setup: set env $GIT_WORK_TREE when .. git.c: make it clear save_env() is for alias handling only
		
			
				
	
	
		
			162 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			162 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
| #!/bin/sh
 | |
| 
 | |
| test_description='.git file
 | |
| 
 | |
| Verify that plumbing commands work when .git is a file
 | |
| '
 | |
| . ./test-lib.sh
 | |
| 
 | |
| objpath() {
 | |
| 	echo "$1" | sed -e 's|\(..\)|\1/|'
 | |
| }
 | |
| 
 | |
| objck() {
 | |
| 	p=$(objpath "$1")
 | |
| 	if test ! -f "$REAL/objects/$p"
 | |
| 	then
 | |
| 		echo "Object not found: $REAL/objects/$p"
 | |
| 		false
 | |
| 	fi
 | |
| }
 | |
| 
 | |
| test_expect_success 'initial setup' '
 | |
| 	REAL="$(pwd)/.real" &&
 | |
| 	mv .git "$REAL"
 | |
| '
 | |
| 
 | |
| test_expect_success 'bad setup: invalid .git file format' '
 | |
| 	echo "gitdir $REAL" >.git &&
 | |
| 	if git rev-parse 2>.err
 | |
| 	then
 | |
| 		echo "git rev-parse accepted an invalid .git file"
 | |
| 		false
 | |
| 	fi &&
 | |
| 	if ! grep "Invalid gitfile format" .err
 | |
| 	then
 | |
| 		echo "git rev-parse returned wrong error"
 | |
| 		false
 | |
| 	fi
 | |
| '
 | |
| 
 | |
| test_expect_success 'bad setup: invalid .git file path' '
 | |
| 	echo "gitdir: $REAL.not" >.git &&
 | |
| 	if git rev-parse 2>.err
 | |
| 	then
 | |
| 		echo "git rev-parse accepted an invalid .git file path"
 | |
| 		false
 | |
| 	fi &&
 | |
| 	if ! grep "Not a git repository" .err
 | |
| 	then
 | |
| 		echo "git rev-parse returned wrong error"
 | |
| 		false
 | |
| 	fi
 | |
| '
 | |
| 
 | |
| test_expect_success 'final setup + check rev-parse --git-dir' '
 | |
| 	echo "gitdir: $REAL" >.git &&
 | |
| 	test "$REAL" = "$(git rev-parse --git-dir)"
 | |
| '
 | |
| 
 | |
| test_expect_success 'check hash-object' '
 | |
| 	echo "foo" >bar &&
 | |
| 	SHA=$(cat bar | git hash-object -w --stdin) &&
 | |
| 	objck $SHA
 | |
| '
 | |
| 
 | |
| test_expect_success 'check cat-file' '
 | |
| 	git cat-file blob $SHA >actual &&
 | |
| 	test_cmp bar actual
 | |
| '
 | |
| 
 | |
| test_expect_success 'check update-index' '
 | |
| 	if test -f "$REAL/index"
 | |
| 	then
 | |
| 		echo "Hmm, $REAL/index exists?"
 | |
| 		false
 | |
| 	fi &&
 | |
| 	rm -f "$REAL/objects/$(objpath $SHA)" &&
 | |
| 	git update-index --add bar &&
 | |
| 	if ! test -f "$REAL/index"
 | |
| 	then
 | |
| 		echo "$REAL/index not found"
 | |
| 		false
 | |
| 	fi &&
 | |
| 	objck $SHA
 | |
| '
 | |
| 
 | |
| test_expect_success 'check write-tree' '
 | |
| 	SHA=$(git write-tree) &&
 | |
| 	objck $SHA
 | |
| '
 | |
| 
 | |
| test_expect_success 'check commit-tree' '
 | |
| 	SHA=$(echo "commit bar" | git commit-tree $SHA) &&
 | |
| 	objck $SHA
 | |
| '
 | |
| 
 | |
| test_expect_success 'check rev-list' '
 | |
| 	echo $SHA >"$REAL/HEAD" &&
 | |
| 	test "$SHA" = "$(git rev-list HEAD)"
 | |
| '
 | |
| 
 | |
| test_expect_success 'setup_git_dir twice in subdir' '
 | |
| 	git init sgd &&
 | |
| 	(
 | |
| 		cd sgd &&
 | |
| 		git config alias.lsfi ls-files &&
 | |
| 		mv .git .realgit &&
 | |
| 		echo "gitdir: .realgit" >.git &&
 | |
| 		mkdir subdir &&
 | |
| 		cd subdir &&
 | |
| 		>foo &&
 | |
| 		git add foo &&
 | |
| 		git lsfi >actual &&
 | |
| 		echo foo >expected &&
 | |
| 		test_cmp expected actual
 | |
| 	)
 | |
| '
 | |
| 
 | |
| test_expect_success 'enter_repo non-strict mode' '
 | |
| 	test_create_repo enter_repo &&
 | |
| 	(
 | |
| 		cd enter_repo &&
 | |
| 		test_tick &&
 | |
| 		test_commit foo &&
 | |
| 		mv .git .realgit &&
 | |
| 		echo "gitdir: .realgit" >.git
 | |
| 	) &&
 | |
| 	git ls-remote enter_repo >actual &&
 | |
| 	cat >expected <<-\EOF &&
 | |
| 	946e985ab20de757ca5b872b16d64e92ff3803a9	HEAD
 | |
| 	946e985ab20de757ca5b872b16d64e92ff3803a9	refs/heads/master
 | |
| 	946e985ab20de757ca5b872b16d64e92ff3803a9	refs/tags/foo
 | |
| 	EOF
 | |
| 	test_cmp expected actual
 | |
| '
 | |
| 
 | |
| test_expect_success 'enter_repo linked checkout' '
 | |
| 	(
 | |
| 		cd enter_repo &&
 | |
| 		git worktree add  ../foo refs/tags/foo
 | |
| 	) &&
 | |
| 	git ls-remote foo >actual &&
 | |
| 	cat >expected <<-\EOF &&
 | |
| 	946e985ab20de757ca5b872b16d64e92ff3803a9	HEAD
 | |
| 	946e985ab20de757ca5b872b16d64e92ff3803a9	refs/heads/master
 | |
| 	946e985ab20de757ca5b872b16d64e92ff3803a9	refs/tags/foo
 | |
| 	EOF
 | |
| 	test_cmp expected actual
 | |
| '
 | |
| 
 | |
| test_expect_success 'enter_repo strict mode' '
 | |
| 	git ls-remote --upload-pack="git upload-pack --strict" foo/.git >actual &&
 | |
| 	cat >expected <<-\EOF &&
 | |
| 	946e985ab20de757ca5b872b16d64e92ff3803a9	HEAD
 | |
| 	946e985ab20de757ca5b872b16d64e92ff3803a9	refs/heads/master
 | |
| 	946e985ab20de757ca5b872b16d64e92ff3803a9	refs/tags/foo
 | |
| 	EOF
 | |
| 	test_cmp expected actual
 | |
| '
 | |
| 
 | |
| test_done
 |