2005-05-30 19:51:00 +00:00
|
|
|
#!/bin/sh
|
2005-06-25 09:22:05 +00:00
|
|
|
#
|
|
|
|
# Copyright (c) 2005 Linus Torvalds
|
|
|
|
#
|
|
|
|
|
2005-11-24 08:12:11 +00:00
|
|
|
. git-sh-setup
|
2005-07-08 17:57:21 +00:00
|
|
|
|
2005-06-25 09:22:05 +00:00
|
|
|
usage () {
|
2005-10-29 04:16:12 +00:00
|
|
|
die 'git commit [-a] [-s] [-v | --no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>] [-e] [<path>...]'
|
2005-06-25 09:22:05 +00:00
|
|
|
}
|
|
|
|
|
2005-08-19 00:20:08 +00:00
|
|
|
all= logfile= use_commit= no_edit= log_given= log_message= verify=t signoff=
|
2005-08-09 00:03:14 +00:00
|
|
|
while case "$#" in 0) break;; esac
|
2005-06-25 09:22:05 +00:00
|
|
|
do
|
2005-08-09 00:03:14 +00:00
|
|
|
case "$1" in
|
|
|
|
-a|--a|--al|--all)
|
|
|
|
all=t
|
|
|
|
shift ;;
|
|
|
|
-F=*|--f=*|--fi=*|--fil=*|--file=*)
|
|
|
|
log_given=t$log_given
|
|
|
|
logfile=`expr "$1" : '-[^=]*=\(.*\)'`
|
|
|
|
no_edit=t
|
|
|
|
shift ;;
|
|
|
|
-F|--f|--fi|--fil|--file)
|
|
|
|
case "$#" in 1) usage ;; esac; shift
|
|
|
|
log_given=t$log_given
|
|
|
|
logfile="$1"
|
|
|
|
no_edit=t
|
|
|
|
shift ;;
|
|
|
|
-m=*|--m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
|
|
|
|
log_given=t$log_given
|
|
|
|
log_message=`expr "$1" : '-[^=]*=\(.*\)'`
|
|
|
|
no_edit=t
|
|
|
|
shift ;;
|
|
|
|
-m|--m|--me|--mes|--mess|--messa|--messag|--message)
|
|
|
|
case "$#" in 1) usage ;; esac; shift
|
|
|
|
log_given=t$log_given
|
|
|
|
log_message="$1"
|
|
|
|
no_edit=t
|
|
|
|
shift ;;
|
|
|
|
-c=*|--ree=*|--reed=*|--reedi=*|--reedit=*|--reedit-=*|--reedit-m=*|\
|
|
|
|
--reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\
|
|
|
|
--reedit-messag=*|--reedit-message=*)
|
|
|
|
log_given=t$log_given
|
|
|
|
use_commit=`expr "$1" : '-[^=]*=\(.*\)'`
|
|
|
|
shift ;;
|
|
|
|
-c|--ree|--reed|--reedi|--reedit|--reedit-|--reedit-m|--reedit-me|\
|
|
|
|
--reedit-mes|--reedit-mess|--reedit-messa|--reedit-messag|--reedit-message)
|
|
|
|
case "$#" in 1) usage ;; esac; shift
|
|
|
|
log_given=t$log_given
|
|
|
|
use_commit="$1"
|
|
|
|
shift ;;
|
|
|
|
-C=*|--reu=*|--reus=*|--reuse=*|--reuse-=*|--reuse-m=*|--reuse-me=*|\
|
|
|
|
--reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\
|
|
|
|
--reuse-message=*)
|
|
|
|
log_given=t$log_given
|
|
|
|
use_commit=`expr "$1" : '-[^=]*=\(.*\)'`
|
|
|
|
no_edit=t
|
|
|
|
shift ;;
|
|
|
|
-C|--reu|--reus|--reuse|--reuse-|--reuse-m|--reuse-me|--reuse-mes|\
|
|
|
|
--reuse-mess|--reuse-messa|--reuse-messag|--reuse-message)
|
|
|
|
case "$#" in 1) usage ;; esac; shift
|
|
|
|
log_given=t$log_given
|
|
|
|
use_commit="$1"
|
|
|
|
no_edit=t
|
|
|
|
shift ;;
|
2005-08-30 04:25:19 +00:00
|
|
|
-e|--e|--ed|--edi|--edit)
|
|
|
|
no_edit=
|
|
|
|
shift ;;
|
2005-08-13 06:39:15 +00:00
|
|
|
-s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
|
|
|
|
signoff=t
|
|
|
|
shift ;;
|
2005-08-19 00:20:08 +00:00
|
|
|
-n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|--no-verify)
|
|
|
|
verify=
|
|
|
|
shift ;;
|
2005-08-13 06:39:15 +00:00
|
|
|
-v|--v|--ve|--ver|--veri|--verif|--verify)
|
|
|
|
verify=t
|
|
|
|
shift ;;
|
2005-08-09 00:03:14 +00:00
|
|
|
--)
|
2005-06-25 09:22:05 +00:00
|
|
|
shift
|
2005-08-09 00:03:14 +00:00
|
|
|
break ;;
|
|
|
|
-*)
|
|
|
|
usage ;;
|
|
|
|
*)
|
|
|
|
break ;;
|
|
|
|
esac
|
2005-06-25 09:22:05 +00:00
|
|
|
done
|
|
|
|
|
2005-08-09 00:03:14 +00:00
|
|
|
case "$log_given" in
|
|
|
|
tt*)
|
|
|
|
die "Only one of -c/-C/-F/-m can be used." ;;
|
|
|
|
esac
|
|
|
|
|
2005-08-17 22:17:03 +00:00
|
|
|
case "$all,$#" in
|
2005-11-25 21:33:14 +00:00
|
|
|
t,0)
|
2005-08-09 00:03:14 +00:00
|
|
|
git-diff-files --name-only -z |
|
2005-09-27 01:13:53 +00:00
|
|
|
git-update-index --remove -z --stdin
|
2005-08-17 01:08:19 +00:00
|
|
|
;;
|
2005-11-25 21:33:14 +00:00
|
|
|
t,*)
|
|
|
|
die "Cannot use -a and explicit files at the same time."
|
|
|
|
;;
|
2005-08-17 22:17:03 +00:00
|
|
|
,0)
|
|
|
|
;;
|
2005-08-17 01:08:19 +00:00
|
|
|
*)
|
2005-10-18 07:27:50 +00:00
|
|
|
git-diff-files --name-only -z -- "$@" |
|
2005-09-27 01:13:53 +00:00
|
|
|
git-update-index --remove -z --stdin
|
2005-08-17 01:08:19 +00:00
|
|
|
;;
|
|
|
|
esac || exit 1
|
2005-09-08 00:26:23 +00:00
|
|
|
git-update-index -q --refresh || exit 1
|
2005-08-09 00:03:14 +00:00
|
|
|
|
2005-08-13 06:39:15 +00:00
|
|
|
case "$verify" in
|
|
|
|
t)
|
2005-08-19 00:20:08 +00:00
|
|
|
if test -x "$GIT_DIR"/hooks/pre-commit
|
|
|
|
then
|
|
|
|
"$GIT_DIR"/hooks/pre-commit || exit
|
|
|
|
fi
|
2005-08-13 06:39:15 +00:00
|
|
|
esac
|
|
|
|
|
2005-08-26 01:57:35 +00:00
|
|
|
if test "$log_message" != ''
|
|
|
|
then
|
|
|
|
echo "$log_message"
|
|
|
|
elif test "$logfile" != ""
|
|
|
|
then
|
|
|
|
if test "$logfile" = -
|
|
|
|
then
|
|
|
|
test -t 0 &&
|
|
|
|
echo >&2 "(reading log message from standard input)"
|
|
|
|
cat
|
|
|
|
else
|
|
|
|
cat <"$logfile"
|
|
|
|
fi
|
|
|
|
elif test "$use_commit" != ""
|
|
|
|
then
|
|
|
|
git-cat-file commit "$use_commit" | sed -e '1,/^$/d'
|
2005-11-02 06:01:28 +00:00
|
|
|
elif test -f "$GIT_DIR/MERGE_HEAD" && test -f "$GIT_DIR/MERGE_MSG"
|
|
|
|
then
|
|
|
|
cat "$GIT_DIR/MERGE_MSG"
|
2005-10-10 00:30:19 +00:00
|
|
|
fi | git-stripspace >"$GIT_DIR"/COMMIT_EDITMSG
|
2005-09-01 00:15:25 +00:00
|
|
|
|
|
|
|
case "$signoff" in
|
|
|
|
t)
|
2005-10-04 06:49:46 +00:00
|
|
|
{
|
|
|
|
echo
|
|
|
|
git-var GIT_COMMITTER_IDENT | sed -e '
|
|
|
|
s/>.*/>/
|
|
|
|
s/^/Signed-off-by: /
|
|
|
|
'
|
2005-10-10 00:30:19 +00:00
|
|
|
} >>"$GIT_DIR"/COMMIT_EDITMSG
|
2005-09-01 00:15:25 +00:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
|
|
|
|
echo "#"
|
|
|
|
echo "# It looks like your may be committing a MERGE."
|
|
|
|
echo "# If this is not correct, please remove the file"
|
|
|
|
echo "# $GIT_DIR/MERGE_HEAD"
|
|
|
|
echo "# and try again"
|
|
|
|
echo "#"
|
2005-10-10 00:30:19 +00:00
|
|
|
fi >>"$GIT_DIR"/COMMIT_EDITMSG
|
2005-08-26 01:57:35 +00:00
|
|
|
|
2005-06-14 17:20:14 +00:00
|
|
|
PARENTS="-p HEAD"
|
2005-09-30 21:26:57 +00:00
|
|
|
if GIT_DIR="$GIT_DIR" git-rev-parse --verify HEAD >/dev/null 2>&1
|
|
|
|
then
|
2005-06-25 09:22:05 +00:00
|
|
|
if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
|
Multi-backend merge driver.
The new command 'git merge' takes the current head and one or more
remote heads, with the commit log message for the automated case.
If the heads being merged are simple fast-forwards, it acts the
same way as the current 'git resolve'. Otherwise, it tries
different merge strategies and takes the result from the one that
succeeded auto-merging, if there is any.
If no merge strategy succeeds auto-merging, their results are
evaluated for number of paths needed for hand resolving, and the
one with the least number of such paths is left in the working
tree. The user is asked to resolve them by hand and make a
commit manually.
The calling convention from the 'git merge' driver to merge
strategy programs is very simple:
- A strategy program is to be called 'git-merge-<strategy>'.
- They take input of this form:
<common1> <common2> ... '--' <head> <remote1> <remote2>...
That is, one or more the common ancestors, double dash, the
current head, and one or more remote heads being merged into
the current branch.
- Before a strategy program is called, the working tree is
matched to the current <head>.
- The strategy program exits with status code 0 when it
successfully auto-merges the given heads. It should do
update-cache for all the merged paths when it does so -- the
index file will be used to record the merge result as a
commit by the driver.
- The strategy program exits with status code 1 when it leaves
conflicts behind. It should do update-cache for all the
merged paths that it successfully auto-merged, and leave the
cache entry in the index file as the same as <head> for paths
it could not auto-merge, and leave its best-effort result
with conflict markers in the working tree when it does so.
- The strategy program exists with status code other than 0 or
1 if it does not handle the given merge at all.
As examples, this commit comes with merge strategies based on
'git resolve' and 'git octopus'.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-08 20:47:12 +00:00
|
|
|
PARENTS="-p HEAD "`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"`
|
2005-08-26 01:57:35 +00:00
|
|
|
fi
|
|
|
|
if test "$use_commit" != ""
|
2005-06-25 09:22:05 +00:00
|
|
|
then
|
|
|
|
pick_author_script='
|
|
|
|
/^author /{
|
|
|
|
h
|
|
|
|
s/^author \([^<]*\) <[^>]*> .*$/\1/
|
|
|
|
s/'\''/'\''\'\'\''/g
|
|
|
|
s/.*/GIT_AUTHOR_NAME='\''&'\''/p
|
|
|
|
|
|
|
|
g
|
|
|
|
s/^author [^<]* <\([^>]*\)> .*$/\1/
|
|
|
|
s/'\''/'\''\'\'\''/g
|
|
|
|
s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p
|
|
|
|
|
|
|
|
g
|
|
|
|
s/^author [^<]* <[^>]*> \(.*\)$/\1/
|
|
|
|
s/'\''/'\''\'\'\''/g
|
|
|
|
s/.*/GIT_AUTHOR_DATE='\''&'\''/p
|
|
|
|
|
|
|
|
q
|
|
|
|
}
|
|
|
|
'
|
|
|
|
set_author_env=`git-cat-file commit "$use_commit" |
|
2005-11-11 07:34:08 +00:00
|
|
|
LANG=C LC_ALL=C sed -ne "$pick_author_script"`
|
2005-06-25 09:22:05 +00:00
|
|
|
eval "$set_author_env"
|
|
|
|
export GIT_AUTHOR_NAME
|
|
|
|
export GIT_AUTHOR_EMAIL
|
|
|
|
export GIT_AUTHOR_DATE
|
2005-08-15 22:37:37 +00:00
|
|
|
fi
|
2005-09-30 21:26:57 +00:00
|
|
|
else
|
|
|
|
if [ -z "$(git-ls-files)" ]; then
|
|
|
|
echo Nothing to commit 1>&2
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
PARENTS=""
|
2005-06-14 17:20:14 +00:00
|
|
|
fi
|
2005-10-10 00:30:19 +00:00
|
|
|
git-status >>"$GIT_DIR"/COMMIT_EDITMSG
|
2005-10-05 16:58:10 +00:00
|
|
|
if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" ]
|
2005-05-30 19:51:00 +00:00
|
|
|
then
|
2005-10-10 00:30:19 +00:00
|
|
|
rm -f "$GIT_DIR/COMMIT_EDITMSG"
|
2005-09-08 00:26:23 +00:00
|
|
|
git-status
|
2005-05-30 19:51:00 +00:00
|
|
|
exit 1
|
|
|
|
fi
|
2005-08-09 00:03:14 +00:00
|
|
|
case "$no_edit" in
|
2005-06-25 09:22:05 +00:00
|
|
|
'')
|
2005-10-10 00:30:19 +00:00
|
|
|
${VISUAL:-${EDITOR:-vi}} "$GIT_DIR/COMMIT_EDITMSG"
|
2005-06-25 09:22:05 +00:00
|
|
|
;;
|
|
|
|
esac
|
2005-08-19 00:20:08 +00:00
|
|
|
|
|
|
|
case "$verify" in
|
|
|
|
t)
|
|
|
|
if test -x "$GIT_DIR"/hooks/commit-msg
|
|
|
|
then
|
2005-10-10 00:30:19 +00:00
|
|
|
"$GIT_DIR"/hooks/commit-msg "$GIT_DIR"/COMMIT_EDITMSG || exit
|
2005-08-19 00:20:08 +00:00
|
|
|
fi
|
|
|
|
esac
|
|
|
|
|
2005-10-10 00:30:19 +00:00
|
|
|
grep -v '^#' < "$GIT_DIR"/COMMIT_EDITMSG |
|
|
|
|
git-stripspace > "$GIT_DIR"/COMMIT_MSG
|
|
|
|
|
|
|
|
if cnt=`grep -v -i '^Signed-off-by' "$GIT_DIR"/COMMIT_MSG |
|
|
|
|
git-stripspace |
|
|
|
|
wc -l` &&
|
|
|
|
test 0 -lt $cnt
|
2005-08-09 00:03:14 +00:00
|
|
|
then
|
2005-06-20 02:57:01 +00:00
|
|
|
tree=$(git-write-tree) &&
|
2005-10-10 00:30:19 +00:00
|
|
|
commit=$(cat "$GIT_DIR"/COMMIT_MSG | git-commit-tree $tree $PARENTS) &&
|
2005-09-28 01:14:27 +00:00
|
|
|
git-update-ref HEAD $commit $current &&
|
2005-06-25 09:22:05 +00:00
|
|
|
rm -f -- "$GIT_DIR/MERGE_HEAD"
|
2005-08-09 00:03:14 +00:00
|
|
|
else
|
|
|
|
echo >&2 "* no commit message? aborting commit."
|
|
|
|
false
|
|
|
|
fi
|
2005-06-20 02:57:01 +00:00
|
|
|
ret="$?"
|
2005-10-10 00:30:19 +00:00
|
|
|
rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG"
|
2005-08-19 00:20:08 +00:00
|
|
|
|
|
|
|
if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0
|
|
|
|
then
|
|
|
|
"$GIT_DIR"/hooks/post-commit
|
|
|
|
fi
|
2005-06-20 02:57:01 +00:00
|
|
|
exit "$ret"
|