Any core commands that use setup_git_directory() now check if given GIT_DIR is really a valid repository, so the same check in git-sh-setup can use it without reimplementing it in shell. This commit changes git-sh-setup to use git-var command for that, although any other commands would do. Note that we export GIT_DIR explicitly when calling git-var; without it, the caller of this script would use GIT_DIR that we return (which is to assume ./.git unless the caller has it elsewhere) while git-var would go up to find a .git directory in our parent directories, which would be checking a different directory from what our callers will be using. Signed-off-by: Junio C Hamano <junkio@cox.net>
		
			
				
	
	
		
			24 lines
		
	
	
		
			706 B
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			24 lines
		
	
	
		
			706 B
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
#!/bin/sh
 | 
						|
#
 | 
						|
# This is included in commands that either have to be run from the toplevel
 | 
						|
# of the repository, or with GIT_DIR environment variable properly.
 | 
						|
# If the GIT_DIR does not look like the right correct git-repository,
 | 
						|
# it dies.
 | 
						|
 | 
						|
# Having this variable in your environment would break scripts because
 | 
						|
# you would cause "cd" to be be taken to unexpected places.  If you
 | 
						|
# like CDPATH, define it for your interactive shell sessions without
 | 
						|
# exporting it.
 | 
						|
unset CDPATH
 | 
						|
 | 
						|
: ${GIT_DIR=.git}
 | 
						|
: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}
 | 
						|
 | 
						|
die() {
 | 
						|
	echo >&2 "$@"
 | 
						|
	exit 1
 | 
						|
}
 | 
						|
 | 
						|
# Make sure we are in a valid repository of a vintage we understand.
 | 
						|
GIT_DIR="$GIT_DIR" git-var GIT_AUTHOR_IDENT >/dev/null || exit
 |