2013-11-25 21:03:52 +00:00
|
|
|
# This shell scriplet is meant to be included by other shell scripts
|
|
|
|
# to set up some variables pointing at the normal git directories and
|
|
|
|
# a few helper shell functions.
|
2005-07-08 17:57:21 +00:00
|
|
|
|
2005-09-13 02:47:07 +00:00
|
|
|
# Having this variable in your environment would break scripts because
|
2007-09-15 23:32:23 +00:00
|
|
|
# you would cause "cd" to be taken to unexpected places. If you
|
2005-09-13 02:47:07 +00:00
|
|
|
# like CDPATH, define it for your interactive shell sessions without
|
|
|
|
# exporting it.
|
2012-08-08 19:08:17 +00:00
|
|
|
# But we protect ourselves from such a user mistake nevertheless.
|
2005-09-13 02:47:07 +00:00
|
|
|
unset CDPATH
|
|
|
|
|
2012-12-07 22:31:52 +00:00
|
|
|
# Similarly for IFS, but some shells (e.g. FreeBSD 7.2) are buggy and
|
|
|
|
# do not equate an unset IFS with IFS with the default, so here is
|
|
|
|
# an explicit SP HT LF.
|
|
|
|
IFS='
|
|
|
|
'
|
2012-08-08 19:08:17 +00:00
|
|
|
|
2009-06-08 16:41:49 +00: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-05 23:36:15 +00:00
|
|
|
|
2011-06-09 07:47:02 +00:00
|
|
|
die () {
|
|
|
|
die_with_status 1 "$@"
|
|
|
|
}
|
|
|
|
|
|
|
|
die_with_status () {
|
|
|
|
status=$1
|
|
|
|
shift
|
2013-08-07 09:26:05 +00:00
|
|
|
printf >&2 '%s\n' "$*"
|
2011-06-09 07:47:02 +00:00
|
|
|
exit "$status"
|
2005-07-08 17:57:21 +00:00
|
|
|
}
|
|
|
|
|
2009-06-16 22:32:59 +00:00
|
|
|
GIT_QUIET=
|
|
|
|
|
|
|
|
say () {
|
|
|
|
if test -z "$GIT_QUIET"
|
|
|
|
then
|
|
|
|
printf '%s\n' "$*"
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2007-11-04 10:30:54 +00:00
|
|
|
if test -n "$OPTIONS_SPEC"; then
|
|
|
|
usage() {
|
2007-12-20 20:58:06 +00:00
|
|
|
"$0" -h
|
|
|
|
exit 1
|
2007-11-04 10:30:54 +00:00
|
|
|
}
|
|
|
|
|
2007-11-08 09:32:11 +00:00
|
|
|
parseopt_extra=
|
|
|
|
[ -n "$OPTIONS_KEEPDASHDASH" ] &&
|
|
|
|
parseopt_extra="--keep-dashdash"
|
|
|
|
|
|
|
|
eval "$(
|
2007-11-08 07:04:38 +00:00
|
|
|
echo "$OPTIONS_SPEC" |
|
2007-11-08 09:32:11 +00:00
|
|
|
git rev-parse --parseopt $parseopt_extra -- "$@" ||
|
|
|
|
echo exit $?
|
|
|
|
)"
|
2007-11-04 10:30:54 +00:00
|
|
|
else
|
2008-07-13 13:36:15 +00:00
|
|
|
dashless=$(basename "$0" | sed -e 's/-/ /')
|
2007-11-04 10:30:54 +00:00
|
|
|
usage() {
|
2013-02-24 00:50:09 +00:00
|
|
|
die "usage: $dashless $USAGE"
|
2007-11-04 10:30:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if [ -z "$LONG_USAGE" ]
|
|
|
|
then
|
2013-02-24 00:50:09 +00:00
|
|
|
LONG_USAGE="usage: $dashless $USAGE"
|
2007-11-04 10:30:54 +00:00
|
|
|
else
|
2013-02-24 00:50:09 +00:00
|
|
|
LONG_USAGE="usage: $dashless $USAGE
|
2007-11-04 10:30:54 +00:00
|
|
|
|
|
|
|
$LONG_USAGE"
|
|
|
|
fi
|
|
|
|
|
|
|
|
case "$1" in
|
2011-10-03 18:21:36 +00:00
|
|
|
-h)
|
2007-11-04 10:30:54 +00:00
|
|
|
echo "$LONG_USAGE"
|
|
|
|
exit
|
|
|
|
esac
|
|
|
|
fi
|
2005-12-11 09:55:49 +00:00
|
|
|
|
setup_reflog_action: document the rules for using GIT_REFLOG_ACTION
The set_reflog_action helper (in git-sh-setup) is designed to be
used once at the very top of a program, like this in "git am", for
example:
set_reflog_action am
The helper function sets the given string to GIT_REFLOG_ACTION only
when GIT_REFLOG_ACTION is not yet set. Thanks to this, "git am",
when run as the top-level program, will use "am" in GIT_REFLOG_ACTION
and the reflog entries made by whatever it does will record the
updates of refs done by "am".
Because of the conditional assignment, when "git am" is run as a
subprogram (i.e. an implementation detail) of "git rebase" that
already sets GIT_REFLOG_ACTION to its own name, the call in "git am"
to the helper function at the beginning will *not* have any effect.
So "git rebase" can do this:
set_reflog_action rebase
... do its own preparation, like checking out "onto" commit
... decide to do "format-patch" to "am" pipeline
git format-patch --stdout >mbox
git am mbox
and the reflog entries made inside "git am" invocation will say
"rebase", not "am".
Calls to "git" commands that update refs would use GIT_REFLOG_ACTION
to record who did that update. Most such calls in scripted Porcelains
do not define custom reflog message and rely on GIT_REFLOG_ACTION to
contain its (or its caller's, when it is called as a subprogram) name.
If a scripted Porcelain wants to record a custom reflog message for
a single invocation of "git" command (e.g. when "git rebase" uses
"git checkout" to detach HEAD at the commit a series is to be
replayed on), it needs to set GIT_REFLOG_ACTION to the custom
message and export it while calling the "git" command, but such an
assignment must be restricted to that single "git" invocation and
should not be left behind to affect later codepath.
Document the rules to avoid future confusion.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-06-19 17:54:00 +00:00
|
|
|
# Set the name of the end-user facing command in the reflog when the
|
|
|
|
# script may update refs. When GIT_REFLOG_ACTION is already set, this
|
|
|
|
# will not overwrite it, so that a scripted Porcelain (e.g. "git
|
|
|
|
# rebase") can set it to its own name (e.g. "rebase") and then call
|
|
|
|
# another scripted Porcelain (e.g. "git am") and a call to this
|
|
|
|
# function in the latter will keep the name of the end-user facing
|
|
|
|
# program (e.g. "rebase") in GIT_REFLOG_ACTION, ensuring whatever it
|
|
|
|
# does will be record as actions done as part of the end-user facing
|
|
|
|
# operation (e.g. "rebase").
|
|
|
|
#
|
|
|
|
# NOTE NOTE NOTE: consequently, after assigning a specific message to
|
|
|
|
# GIT_REFLOG_ACTION when calling a "git" command to record a custom
|
|
|
|
# reflog message, do not leave that custom value in GIT_REFLOG_ACTION,
|
|
|
|
# after you are done. Other callers of "git" commands that rely on
|
|
|
|
# writing the default "program name" in reflog expect the variable to
|
|
|
|
# contain the value set by this function.
|
|
|
|
#
|
|
|
|
# To use a custom reflog message, do either one of these three:
|
|
|
|
#
|
|
|
|
# (a) use a single-shot export form:
|
|
|
|
# GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: preparing frotz" \
|
|
|
|
# git command-that-updates-a-ref
|
|
|
|
#
|
|
|
|
# (b) save the original away and restore:
|
|
|
|
# SAVED_ACTION=$GIT_REFLOG_ACTION
|
|
|
|
# GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: preparing frotz"
|
|
|
|
# git command-that-updates-a-ref
|
|
|
|
# GIT_REFLOG_ACITON=$SAVED_ACTION
|
|
|
|
#
|
|
|
|
# (c) assign the variable in a subshell:
|
|
|
|
# (
|
|
|
|
# GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: preparing frotz"
|
|
|
|
# git command-that-updates-a-ref
|
|
|
|
# )
|
2006-12-28 07:34:48 +00:00
|
|
|
set_reflog_action() {
|
|
|
|
if [ -z "${GIT_REFLOG_ACTION:+set}" ]
|
|
|
|
then
|
|
|
|
GIT_REFLOG_ACTION="$*"
|
|
|
|
export GIT_REFLOG_ACTION
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2007-07-20 05:09:35 +00:00
|
|
|
git_editor() {
|
2009-10-31 01:42:34 +00:00
|
|
|
if test -z "${GIT_EDITOR:+set}"
|
|
|
|
then
|
|
|
|
GIT_EDITOR="$(git var GIT_EDITOR)" || return $?
|
|
|
|
fi
|
|
|
|
|
|
|
|
eval "$GIT_EDITOR" '"$@"'
|
2007-07-20 05:09:35 +00:00
|
|
|
}
|
|
|
|
|
2010-02-15 05:04:13 +00:00
|
|
|
git_pager() {
|
|
|
|
if test -t 1
|
|
|
|
then
|
|
|
|
GIT_PAGER=$(git var GIT_PAGER)
|
|
|
|
else
|
|
|
|
GIT_PAGER=cat
|
|
|
|
fi
|
|
|
|
: ${LESS=-FRSX}
|
2014-01-07 02:14:05 +00:00
|
|
|
: ${LV=-c}
|
|
|
|
export LESS LV
|
2010-02-15 05:04:13 +00:00
|
|
|
|
|
|
|
eval "$GIT_PAGER" '"$@"'
|
|
|
|
}
|
|
|
|
|
2009-11-23 23:56:32 +00:00
|
|
|
sane_grep () {
|
|
|
|
GREP_OPTIONS= LC_ALL=C grep "$@"
|
|
|
|
}
|
|
|
|
|
|
|
|
sane_egrep () {
|
|
|
|
GREP_OPTIONS= LC_ALL=C egrep "$@"
|
|
|
|
}
|
|
|
|
|
2007-01-07 10:17:52 +00:00
|
|
|
is_bare_repository () {
|
2007-07-03 05:52:14 +00:00
|
|
|
git rev-parse --is-bare-repository
|
2007-01-07 10:17:52 +00:00
|
|
|
}
|
|
|
|
|
2007-01-12 20:44:08 +00:00
|
|
|
cd_to_toplevel () {
|
2010-01-11 22:34:34 +00: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 20:44:08 +00: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 02:11:18 +00: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 04:32:38 +00:00
|
|
|
require_work_tree () {
|
2010-02-17 04:18:50 +00:00
|
|
|
test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true ||
|
2006-12-31 04:32:38 +00:00
|
|
|
die "fatal: $0 cannot be used without a working tree."
|
|
|
|
}
|
|
|
|
|
2010-10-19 14:39:28 +00: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
|
|
|
|
}
|
|
|
|
|
2012-10-18 07:25:22 +00:00
|
|
|
# Generate a sed script to parse identities from a commit.
|
|
|
|
#
|
|
|
|
# Reads the commit from stdin, which should be in raw format (e.g., from
|
|
|
|
# cat-file or "--pretty=raw").
|
|
|
|
#
|
|
|
|
# The first argument specifies the ident line to parse (e.g., "author"), and
|
|
|
|
# the second specifies the environment variable to put it in (e.g., "AUTHOR"
|
|
|
|
# for "GIT_AUTHOR_*"). Multiple pairs can be given to parse author and
|
|
|
|
# committer.
|
|
|
|
pick_ident_script () {
|
|
|
|
while test $# -gt 0
|
|
|
|
do
|
|
|
|
lid=$1; shift
|
|
|
|
uid=$1; shift
|
|
|
|
printf '%s' "
|
|
|
|
/^$lid /{
|
|
|
|
s/'/'\\\\''/g
|
|
|
|
h
|
|
|
|
s/^$lid "'\([^<]*\) <[^>]*> .*$/\1/'"
|
|
|
|
s/.*/GIT_${uid}_NAME='&'/p
|
|
|
|
|
|
|
|
g
|
|
|
|
s/^$lid "'[^<]* <\([^>]*\)> .*$/\1/'"
|
|
|
|
s/.*/GIT_${uid}_EMAIL='&'/p
|
|
|
|
|
|
|
|
g
|
|
|
|
s/^$lid "'[^<]* <[^>]*> \(.*\)$/@\1/'"
|
|
|
|
s/.*/GIT_${uid}_DATE='&'/p
|
|
|
|
}
|
|
|
|
"
|
|
|
|
done
|
|
|
|
echo '/^$/q'
|
|
|
|
}
|
|
|
|
|
|
|
|
# Create a pick-script as above and feed it to sed. Stdout is suitable for
|
|
|
|
# feeding to eval.
|
|
|
|
parse_ident_from_commit () {
|
|
|
|
LANG=C LC_ALL=C sed -ne "$(pick_ident_script "$@")"
|
|
|
|
}
|
|
|
|
|
|
|
|
# Parse the author from a commit given as an argument. Stdout is suitable for
|
|
|
|
# feeding to eval to set the usual GIT_* ident variables.
|
2007-06-25 00:04:11 +00:00
|
|
|
get_author_ident_from_commit () {
|
|
|
|
encoding=$(git config i18n.commitencoding || echo UTF-8)
|
2008-02-13 21:13:21 +00:00
|
|
|
git show -s --pretty=raw --encoding="$encoding" "$1" -- |
|
2012-10-18 07:25:22 +00:00
|
|
|
parse_ident_from_commit author AUTHOR
|
2007-06-25 00:04:11 +00:00
|
|
|
}
|
|
|
|
|
2010-02-24 23:34:16 +00: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)
|
|
|
|
}
|
|
|
|
|
mergetools/p4merge: create a base if none available
Originally, with no base, Git gave P4Merge $LOCAL as a dummy base:
p4merge "$LOCAL" "$LOCAL" "$REMOTE" "$MERGED"
Commit 0a0ec7bd changed this to:
p4merge "empty file" "$LOCAL" "$REMOTE" "$MERGED"
to avoid the problem of being unable to save in some circumstances with
similar inputs.
Unfortunately this approach produces much worse results on differing
inputs. P4Merge really regards the blank file as the base, and once you
have just a couple of differences between the two branches you end up
with one a massive full-file conflict. The 3-way diff is not readable,
and you have to invoke "difftool MERGE_HEAD HEAD" manually to get a
useful view.
The original approach appears to have invoked special 2-way merge
behaviour in P4Merge that occurs only if the base filename is "" or
equal to the left input. You get a good visual comparison, and it does
not auto-resolve differences. (Normally if one branch matched the base,
it would autoresolve to the other branch).
But there appears to be no way of getting this 2-way behaviour and being
able to reliably save. Having base==left appears to be triggering other
assumptions. There are tricks the user can use to force the save icon
on, but it's not intuitive.
So we now follow a suggestion given in the original patch's discussion:
generate a virtual base, consisting of the lines common to the two
branches. This is the same as the technique used in resolve and octopus
merges, so we relocate that code to a shared function.
Note that if there are no differences at the same location, this
technique can lead to automatic resolution without conflict, combining
everything from the 2 files. As with the other merges using this
technique, we assume the user will inspect the result before saving.
Signed-off-by: Kevin Bracey <kevin@bracey.fi>
Reviewed-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-13 01:12:21 +00:00
|
|
|
# Generate a virtual base file for a two-file merge. Uses git apply to
|
|
|
|
# remove lines from $1 that are not in $2, leaving only common lines.
|
|
|
|
create_virtual_base() {
|
|
|
|
sz0=$(wc -c <"$1")
|
|
|
|
@@DIFF@@ -u -La/"$1" -Lb/"$1" "$1" "$2" | git apply --no-add
|
|
|
|
sz1=$(wc -c <"$1")
|
|
|
|
|
|
|
|
# If we do not have enough common material, it is not
|
|
|
|
# worth trying two-file merge using common subsections.
|
|
|
|
expr $sz0 \< $sz1 \* 2 >/dev/null || : >"$1"
|
|
|
|
}
|
|
|
|
|
2007-11-30 21:06:30 +00:00
|
|
|
|
2012-05-16 17:36:01 +00:00
|
|
|
# Platform specific tweaks to work around some commands
|
2007-11-30 21:06:30 +00: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 18:48:39 +00:00
|
|
|
# git sees Windows-style pwd
|
|
|
|
pwd () {
|
|
|
|
builtin pwd -W
|
|
|
|
}
|
2010-09-30 13:24:07 +00:00
|
|
|
is_absolute_path () {
|
|
|
|
case "$1" in
|
|
|
|
[/\\]* | [A-Za-z]:*)
|
|
|
|
return 0 ;;
|
|
|
|
esac
|
|
|
|
return 1
|
|
|
|
}
|
2007-11-30 21:06:30 +00:00
|
|
|
;;
|
2010-09-30 13:24:07 +00:00
|
|
|
*)
|
|
|
|
is_absolute_path () {
|
|
|
|
case "$1" in
|
|
|
|
/*)
|
|
|
|
return 0 ;;
|
|
|
|
esac
|
|
|
|
return 1
|
|
|
|
}
|
2007-11-30 21:06:30 +00:00
|
|
|
esac
|
2012-05-16 17:36:01 +00: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
|
2013-06-14 13:17:51 +00:00
|
|
|
|
|
|
|
peel_committish () {
|
|
|
|
case "$1" in
|
|
|
|
:/*)
|
|
|
|
peeltmp=$(git rev-parse --verify "$1") &&
|
|
|
|
git rev-parse --verify "${peeltmp}^0"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
git rev-parse --verify "${1}^0"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
}
|