2005-07-08 19:57:21 +02:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
2005-11-24 09:12:11 +01:00
|
|
|
# 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.
|
2005-07-08 19:57:21 +02:00
|
|
|
|
2005-09-13 04:47:07 +02:00
|
|
|
# Having this variable in your environment would break scripts because
|
2007-09-16 01:32:23 +02:00
|
|
|
# you would cause "cd" to be taken to unexpected places. If you
|
2005-09-13 04:47:07 +02:00
|
|
|
# like CDPATH, define it for your interactive shell sessions without
|
|
|
|
# exporting it.
|
|
|
|
unset CDPATH
|
|
|
|
|
2009-06-08 18:41:49 +02:00
|
|
|
git_broken_path_fix () {
|
|
|
|
case ":$PATH:" in
|
|
|
|
*:$1:*) : ok ;;
|
|
|
|
*)
|
|
|
|
PATH=$(
|
|
|
|
SANE_TOOL_PATH="$1"
|
|
|
|
IFS=: path= sep=
|
|
|
|
set x $PATH
|
|
|
|
shift
|
|
|
|
for elem
|
|
|
|
do
|
|
|
|
case "$SANE_TOOL_PATH:$elem" in
|
|
|
|
(?*:/bin | ?*:/usr/bin)
|
|
|
|
path="$path$sep$SANE_TOOL_PATH"
|
|
|
|
sep=:
|
|
|
|
SANE_TOOL_PATH=
|
|
|
|
esac
|
|
|
|
path="$path$sep$elem"
|
|
|
|
sep=:
|
|
|
|
done
|
|
|
|
echo "$path"
|
|
|
|
)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
}
|
|
|
|
|
|
|
|
# @@BROKEN_PATH_FIX@@
|
2009-06-06 01:36:15 +02:00
|
|
|
|
2011-06-09 09:47:02 +02:00
|
|
|
die () {
|
|
|
|
die_with_status 1 "$@"
|
|
|
|
}
|
|
|
|
|
|
|
|
die_with_status () {
|
|
|
|
status=$1
|
|
|
|
shift
|
|
|
|
echo >&2 "$*"
|
|
|
|
exit "$status"
|
2005-07-08 19:57:21 +02:00
|
|
|
}
|
|
|
|
|
2009-06-17 00:32:59 +02:00
|
|
|
GIT_QUIET=
|
|
|
|
|
|
|
|
say () {
|
|
|
|
if test -z "$GIT_QUIET"
|
|
|
|
then
|
|
|
|
printf '%s\n' "$*"
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2007-11-04 11:30:54 +01:00
|
|
|
if test -n "$OPTIONS_SPEC"; then
|
|
|
|
usage() {
|
2007-12-20 21:58:06 +01:00
|
|
|
"$0" -h
|
|
|
|
exit 1
|
2007-11-04 11:30:54 +01:00
|
|
|
}
|
|
|
|
|
2007-11-08 10:32:11 +01:00
|
|
|
parseopt_extra=
|
|
|
|
[ -n "$OPTIONS_KEEPDASHDASH" ] &&
|
|
|
|
parseopt_extra="--keep-dashdash"
|
|
|
|
|
|
|
|
eval "$(
|
2007-11-08 08:04:38 +01:00
|
|
|
echo "$OPTIONS_SPEC" |
|
2007-11-08 10:32:11 +01:00
|
|
|
git rev-parse --parseopt $parseopt_extra -- "$@" ||
|
|
|
|
echo exit $?
|
|
|
|
)"
|
2007-11-04 11:30:54 +01:00
|
|
|
else
|
2008-07-13 15:36:15 +02:00
|
|
|
dashless=$(basename "$0" | sed -e 's/-/ /')
|
2007-11-04 11:30:54 +01:00
|
|
|
usage() {
|
2008-07-13 15:36:15 +02:00
|
|
|
die "Usage: $dashless $USAGE"
|
2007-11-04 11:30:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if [ -z "$LONG_USAGE" ]
|
|
|
|
then
|
2008-07-13 15:36:15 +02:00
|
|
|
LONG_USAGE="Usage: $dashless $USAGE"
|
2007-11-04 11:30:54 +01:00
|
|
|
else
|
2008-07-13 15:36:15 +02:00
|
|
|
LONG_USAGE="Usage: $dashless $USAGE
|
2007-11-04 11:30:54 +01:00
|
|
|
|
|
|
|
$LONG_USAGE"
|
|
|
|
fi
|
|
|
|
|
|
|
|
case "$1" in
|
2011-10-03 20:21:36 +02:00
|
|
|
-h)
|
2007-11-04 11:30:54 +01:00
|
|
|
echo "$LONG_USAGE"
|
|
|
|
exit
|
|
|
|
esac
|
|
|
|
fi
|
2005-12-11 10:55:49 +01:00
|
|
|
|
2006-12-28 08:34:48 +01:00
|
|
|
set_reflog_action() {
|
|
|
|
if [ -z "${GIT_REFLOG_ACTION:+set}" ]
|
|
|
|
then
|
|
|
|
GIT_REFLOG_ACTION="$*"
|
|
|
|
export GIT_REFLOG_ACTION
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2007-07-20 07:09:35 +02:00
|
|
|
git_editor() {
|
2009-10-31 02:42:34 +01:00
|
|
|
if test -z "${GIT_EDITOR:+set}"
|
|
|
|
then
|
|
|
|
GIT_EDITOR="$(git var GIT_EDITOR)" || return $?
|
|
|
|
fi
|
|
|
|
|
|
|
|
eval "$GIT_EDITOR" '"$@"'
|
2007-07-20 07:09:35 +02:00
|
|
|
}
|
|
|
|
|
2010-02-15 06:04:13 +01:00
|
|
|
git_pager() {
|
|
|
|
if test -t 1
|
|
|
|
then
|
|
|
|
GIT_PAGER=$(git var GIT_PAGER)
|
|
|
|
else
|
|
|
|
GIT_PAGER=cat
|
|
|
|
fi
|
|
|
|
: ${LESS=-FRSX}
|
|
|
|
export LESS
|
|
|
|
|
|
|
|
eval "$GIT_PAGER" '"$@"'
|
|
|
|
}
|
|
|
|
|
2009-11-24 00:56:32 +01:00
|
|
|
sane_grep () {
|
|
|
|
GREP_OPTIONS= LC_ALL=C grep "$@"
|
|
|
|
}
|
|
|
|
|
|
|
|
sane_egrep () {
|
|
|
|
GREP_OPTIONS= LC_ALL=C egrep "$@"
|
|
|
|
}
|
|
|
|
|
2007-01-07 11:17:52 +01:00
|
|
|
is_bare_repository () {
|
2007-07-03 07:52:14 +02:00
|
|
|
git rev-parse --is-bare-repository
|
2007-01-07 11:17:52 +01:00
|
|
|
}
|
|
|
|
|
2007-01-12 21:44:08 +01:00
|
|
|
cd_to_toplevel () {
|
2010-01-11 23:34:34 +01:00
|
|
|
cdup=$(git rev-parse --show-toplevel) &&
|
|
|
|
cd "$cdup" || {
|
|
|
|
echo >&2 "Cannot chdir to $cdup, the toplevel of the working tree"
|
|
|
|
exit 1
|
|
|
|
}
|
2007-01-12 21:44:08 +01:00
|
|
|
}
|
|
|
|
|
require-work-tree wants more than what its name says
Somebody tried "git pull" from a random place completely outside the work
tree, while exporting GIT_DIR and GIT_WORK_TREE that are set to correct
places, e.g.
GIT_WORK_TREE=$HOME/git.git
GIT_DIR=$GIT_WORK_TREE/.git
export GIT_WORK_TREE GIT_DIR
cd /tmp
git pull
At the beginning of git-pull, we check "require-work-tree" and then
"cd-to-toplevel". I _think_ the original intention when I wrote the
command was "we MUST have a work tree, our $(cwd) might not be at the
top-level directory of it", and no stronger than that. That check is a
very sensible thing to do before doing cd-to-toplevel. We check that the
place we would want to go exists, and then go there.
But the implementation of require_work_tree we have today is quite
different. I don't have energy to dig the history, but currently it says:
test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true ||
die "fatal: $0 cannot be used without a working tree."
Which is completely bogus. Even though we may happen to be just outside
of it right now, we may have a working tree that we can cd_to_toplevel
back to.
Add a function "require_work_tree_exists" that implements the check
this function originally intended (this is so that third-party scripts
that rely on the current behaviour do not have to get broken).
For now, update _no_ in-tree scripts, not even "git pull", as nobody on
the list seems to really care about the above corner case workflow that
triggered this. Scripts can be updated after vetting that they do want the
"we want to make sure the place we are going to go actually exists"
semantics.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-05-05 04:11:18 +02:00
|
|
|
require_work_tree_exists () {
|
|
|
|
if test "z$(git rev-parse --is-bare-repository)" != zfalse
|
|
|
|
then
|
|
|
|
die "fatal: $0 cannot be used without a working tree."
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2006-12-31 05:32:38 +01:00
|
|
|
require_work_tree () {
|
2010-02-17 05:18:50 +01:00
|
|
|
test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true ||
|
2006-12-31 05:32:38 +01:00
|
|
|
die "fatal: $0 cannot be used without a working tree."
|
|
|
|
}
|
|
|
|
|
2010-10-19 16:39:28 +02:00
|
|
|
require_clean_work_tree () {
|
|
|
|
git rev-parse --verify HEAD >/dev/null || exit 1
|
|
|
|
git update-index -q --ignore-submodules --refresh
|
|
|
|
err=0
|
|
|
|
|
|
|
|
if ! git diff-files --quiet --ignore-submodules
|
|
|
|
then
|
|
|
|
echo >&2 "Cannot $1: You have unstaged changes."
|
|
|
|
err=1
|
|
|
|
fi
|
|
|
|
|
|
|
|
if ! git diff-index --cached --quiet --ignore-submodules HEAD --
|
|
|
|
then
|
|
|
|
if [ $err = 0 ]
|
|
|
|
then
|
|
|
|
echo >&2 "Cannot $1: Your index contains uncommitted changes."
|
|
|
|
else
|
|
|
|
echo >&2 "Additionally, your index contains uncommitted changes."
|
|
|
|
fi
|
|
|
|
err=1
|
|
|
|
fi
|
|
|
|
|
|
|
|
if [ $err = 1 ]
|
|
|
|
then
|
|
|
|
test -n "$2" && echo >&2 "$2"
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2007-06-25 02:04:11 +02:00
|
|
|
get_author_ident_from_commit () {
|
|
|
|
pick_author_script='
|
|
|
|
/^author /{
|
|
|
|
s/'\''/'\''\\'\'\''/g
|
|
|
|
h
|
|
|
|
s/^author \([^<]*\) <[^>]*> .*$/\1/
|
|
|
|
s/.*/GIT_AUTHOR_NAME='\''&'\''/p
|
|
|
|
|
|
|
|
g
|
|
|
|
s/^author [^<]* <\([^>]*\)> .*$/\1/
|
|
|
|
s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p
|
|
|
|
|
|
|
|
g
|
2012-02-02 22:41:43 +01:00
|
|
|
s/^author [^<]* <[^>]*> \(.*\)$/@\1/
|
2007-06-25 02:04:11 +02:00
|
|
|
s/.*/GIT_AUTHOR_DATE='\''&'\''/p
|
|
|
|
|
|
|
|
q
|
|
|
|
}
|
|
|
|
'
|
|
|
|
encoding=$(git config i18n.commitencoding || echo UTF-8)
|
2008-02-13 22:13:21 +01:00
|
|
|
git show -s --pretty=raw --encoding="$encoding" "$1" -- |
|
2007-06-25 02:04:11 +02:00
|
|
|
LANG=C LC_ALL=C sed -ne "$pick_author_script"
|
|
|
|
}
|
|
|
|
|
2010-02-25 00:34:16 +01:00
|
|
|
# Clear repo-local GIT_* environment variables. Useful when switching to
|
|
|
|
# another repository (e.g. when entering a submodule). See also the env
|
|
|
|
# list in git_connect()
|
|
|
|
clear_local_git_env() {
|
|
|
|
unset $(git rev-parse --local-env-vars)
|
|
|
|
}
|
|
|
|
|
2007-11-30 22:06:30 +01:00
|
|
|
|
2012-05-16 19:36:01 +02:00
|
|
|
# Platform specific tweaks to work around some commands
|
2007-11-30 22:06:30 +01:00
|
|
|
case $(uname -s) in
|
|
|
|
*MINGW*)
|
|
|
|
# Windows has its own (incompatible) sort and find
|
|
|
|
sort () {
|
|
|
|
/usr/bin/sort "$@"
|
|
|
|
}
|
|
|
|
find () {
|
|
|
|
/usr/bin/find "$@"
|
|
|
|
}
|
2012-04-17 20:48:39 +02:00
|
|
|
# git sees Windows-style pwd
|
|
|
|
pwd () {
|
|
|
|
builtin pwd -W
|
|
|
|
}
|
2010-09-30 15:24:07 +02:00
|
|
|
is_absolute_path () {
|
|
|
|
case "$1" in
|
|
|
|
[/\\]* | [A-Za-z]:*)
|
|
|
|
return 0 ;;
|
|
|
|
esac
|
|
|
|
return 1
|
|
|
|
}
|
2007-11-30 22:06:30 +01:00
|
|
|
;;
|
2010-09-30 15:24:07 +02:00
|
|
|
*)
|
|
|
|
is_absolute_path () {
|
|
|
|
case "$1" in
|
|
|
|
/*)
|
|
|
|
return 0 ;;
|
|
|
|
esac
|
|
|
|
return 1
|
|
|
|
}
|
2007-11-30 22:06:30 +01:00
|
|
|
esac
|
2012-05-16 19:36:01 +02:00
|
|
|
|
|
|
|
# Make sure we are in a valid repository of a vintage we understand,
|
|
|
|
# if we require to be in a git repository.
|
|
|
|
if test -z "$NONGIT_OK"
|
|
|
|
then
|
|
|
|
GIT_DIR=$(git rev-parse --git-dir) || exit
|
|
|
|
if [ -z "$SUBDIRECTORY_OK" ]
|
|
|
|
then
|
|
|
|
test -z "$(git rev-parse --show-cdup)" || {
|
|
|
|
exit=$?
|
|
|
|
echo >&2 "You need to run this command from the toplevel of the working tree."
|
|
|
|
exit $exit
|
|
|
|
}
|
|
|
|
fi
|
|
|
|
test -n "$GIT_DIR" && GIT_DIR=$(cd "$GIT_DIR" && pwd) || {
|
|
|
|
echo >&2 "Unable to determine absolute path of git directory"
|
|
|
|
exit 1
|
|
|
|
}
|
|
|
|
: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}
|
|
|
|
fi
|