mirror of
https://github.com/git/git
synced 2024-07-16 10:38:05 +00:00
e2f5f6ef67
My stupidity deserved to be yelled at by Linus ... there is no reason to require the working tree to be clean when merging -- the only requirements are index to match HEAD commit and the paths involved in merge are up to date in the working tree. Revert and cherry-pick are just specialized forms of merge, and the requirements should be the same. Remove the 'general purpose routine to make sure tree is clean' from git-sh-setup, to prevent me from getting tempted again. Signed-off-by: Junio C Hamano <junkio@cox.net>
23 lines
519 B
Bash
Executable file
23 lines
519 B
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Set up GIT_DIR and GIT_OBJECT_DIRECTORY
|
|
# and return true if everything looks ok
|
|
#
|
|
: ${GIT_DIR=.git}
|
|
: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}
|
|
|
|
# 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
|
|
|
|
die() {
|
|
echo "$@" >&2
|
|
exit 1
|
|
}
|
|
|
|
[ -h "$GIT_DIR/HEAD" ] &&
|
|
[ -d "$GIT_DIR/refs" ] &&
|
|
[ -d "$GIT_OBJECT_DIRECTORY/00" ]
|