2005-10-07 10:44:18 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
2006-02-19 04:51:26 +00:00
|
|
|
# Copyright (c) 2005, 2006 Junio C Hamano
|
2005-10-07 10:44:18 +00:00
|
|
|
|
2008-03-01 06:22:55 +00:00
|
|
|
SUBDIRECTORY_OK=Yes
|
2007-11-04 10:30:57 +00:00
|
|
|
OPTIONS_KEEPDASHDASH=
|
|
|
|
OPTIONS_SPEC="\
|
2010-10-08 17:31:17 +00:00
|
|
|
git am [options] [(<mbox>|<Maildir>)...]
|
2008-07-25 18:22:23 +00:00
|
|
|
git am [options] (--resolved | --skip | --abort)
|
2007-11-04 10:30:57 +00:00
|
|
|
--
|
2007-11-09 07:04:31 +00:00
|
|
|
i,interactive run interactively
|
2009-01-28 15:03:10 +00:00
|
|
|
b,binary* (historical option -- no-op)
|
2007-11-04 10:30:57 +00:00
|
|
|
3,3way allow fall back on 3way merging if needed
|
2009-06-16 22:33:01 +00:00
|
|
|
q,quiet be quiet
|
2007-11-04 10:30:57 +00:00
|
|
|
s,signoff add a Signed-off-by line to the commit message
|
|
|
|
u,utf8 recode into utf8 (default)
|
2008-02-02 23:58:06 +00:00
|
|
|
k,keep pass -k flag to git-mailinfo
|
2012-01-16 10:53:00 +00:00
|
|
|
keep-non-patch pass -b flag to git-mailinfo
|
2010-02-27 14:20:26 +00:00
|
|
|
keep-cr pass --keep-cr flag to git-mailsplit for mbox format
|
2010-02-27 14:20:27 +00:00
|
|
|
no-keep-cr do not pass --keep-cr flag to git-mailsplit independent of am.keepcr
|
2009-08-27 04:36:05 +00:00
|
|
|
c,scissors strip everything before a scissors line
|
2007-11-04 10:30:57 +00:00
|
|
|
whitespace= pass it through git-apply
|
2009-08-04 11:16:49 +00:00
|
|
|
ignore-space-change pass it through git-apply
|
|
|
|
ignore-whitespace pass it through git-apply
|
2009-01-12 06:21:48 +00:00
|
|
|
directory= pass it through git-apply
|
2011-08-03 09:37:29 +00:00
|
|
|
exclude= pass it through git-apply
|
2007-11-04 10:30:57 +00:00
|
|
|
C= pass it through git-apply
|
|
|
|
p= pass it through git-apply
|
2009-05-27 09:25:16 +00:00
|
|
|
patch-format= format the patch(es) are in
|
2009-01-23 00:31:21 +00:00
|
|
|
reject pass it through git-apply
|
2007-11-04 10:30:57 +00:00
|
|
|
resolvemsg= override error message when patch failure occurs
|
2010-02-11 22:27:14 +00:00
|
|
|
continue continue applying patches after resolving a conflict
|
|
|
|
r,resolved synonyms for --continue
|
2008-03-04 08:25:06 +00:00
|
|
|
skip skip the current patch
|
2008-07-16 10:39:10 +00:00
|
|
|
abort restore the original branch and abort the patching operation.
|
2009-01-23 00:14:58 +00:00
|
|
|
committer-date-is-author-date lie about committer date
|
2009-01-24 01:18:02 +00:00
|
|
|
ignore-date use current timestamp for author date
|
2009-12-04 08:20:48 +00:00
|
|
|
rerere-autoupdate update the index with reused conflict resolution if possible
|
2009-01-28 15:03:10 +00:00
|
|
|
rebasing* (internal use for git-rebase)"
|
2007-11-04 10:30:57 +00:00
|
|
|
|
2005-12-13 22:30:31 +00:00
|
|
|
. git-sh-setup
|
2011-05-21 18:43:42 +00:00
|
|
|
. git-sh-i18n
|
2008-03-04 08:25:04 +00:00
|
|
|
prefix=$(git rev-parse --show-prefix)
|
2006-12-28 07:34:48 +00:00
|
|
|
set_reflog_action am
|
2006-12-31 04:32:38 +00:00
|
|
|
require_work_tree
|
2008-03-01 06:22:55 +00:00
|
|
|
cd_to_toplevel
|
2005-10-07 10:44:18 +00:00
|
|
|
|
2008-07-12 15:46:59 +00:00
|
|
|
git var GIT_COMMITTER_IDENT >/dev/null ||
|
2011-05-21 18:43:47 +00:00
|
|
|
die "$(gettext "You need to set your committer info first")"
|
2006-02-19 04:51:26 +00:00
|
|
|
|
2009-04-10 00:34:42 +00:00
|
|
|
if git rev-parse --verify -q HEAD >/dev/null
|
|
|
|
then
|
|
|
|
HAS_HEAD=yes
|
|
|
|
else
|
|
|
|
HAS_HEAD=
|
|
|
|
fi
|
|
|
|
|
2010-06-02 08:33:35 +00:00
|
|
|
cmdline="git am"
|
|
|
|
if test '' != "$interactive"
|
|
|
|
then
|
|
|
|
cmdline="$cmdline -i"
|
|
|
|
fi
|
|
|
|
if test '' != "$threeway"
|
|
|
|
then
|
|
|
|
cmdline="$cmdline -3"
|
|
|
|
fi
|
|
|
|
|
2009-01-12 06:21:48 +00:00
|
|
|
sq () {
|
2009-04-24 06:29:01 +00:00
|
|
|
git rev-parse --sq-quote "$@"
|
2009-01-12 06:21:48 +00:00
|
|
|
}
|
|
|
|
|
2005-10-07 10:44:18 +00:00
|
|
|
stop_here () {
|
|
|
|
echo "$1" >"$dotest/next"
|
2010-12-21 18:35:53 +00:00
|
|
|
git rev-parse --verify -q HEAD >"$dotest/abort-safety"
|
2005-10-07 10:44:18 +00:00
|
|
|
exit 1
|
|
|
|
}
|
|
|
|
|
2010-12-21 18:35:53 +00:00
|
|
|
safe_to_abort () {
|
|
|
|
if test -f "$dotest/dirtyindex"
|
|
|
|
then
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
if ! test -s "$dotest/abort-safety"
|
|
|
|
then
|
|
|
|
return 0
|
|
|
|
fi
|
|
|
|
|
|
|
|
abort_safety=$(cat "$dotest/abort-safety")
|
|
|
|
if test "z$(git rev-parse --verify -q HEAD)" = "z$abort_safety"
|
|
|
|
then
|
|
|
|
return 0
|
|
|
|
fi
|
2011-08-07 11:58:14 +00:00
|
|
|
gettextln "You seem to have moved HEAD since the last 'am' failure.
|
|
|
|
Not rewinding to ORIG_HEAD" >&2
|
2010-12-21 18:35:53 +00:00
|
|
|
return 1
|
|
|
|
}
|
|
|
|
|
2006-05-02 12:32:43 +00:00
|
|
|
stop_here_user_resolve () {
|
2006-05-14 03:34:08 +00:00
|
|
|
if [ -n "$resolvemsg" ]; then
|
2007-05-26 07:33:03 +00:00
|
|
|
printf '%s\n' "$resolvemsg"
|
2006-05-14 03:34:08 +00:00
|
|
|
stop_here $1
|
|
|
|
fi
|
2011-08-07 11:58:14 +00:00
|
|
|
eval_gettextln "When you have resolved this problem run \"\$cmdline --resolved\".
|
2011-05-21 18:43:45 +00:00
|
|
|
If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
|
2011-08-07 11:58:14 +00:00
|
|
|
To restore the original branch and stop patching run \"\$cmdline --abort\"."
|
2006-05-02 12:32:43 +00:00
|
|
|
|
|
|
|
stop_here $1
|
|
|
|
}
|
|
|
|
|
2005-10-07 10:44:18 +00:00
|
|
|
go_next () {
|
|
|
|
rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \
|
|
|
|
"$dotest/patch" "$dotest/info"
|
|
|
|
echo "$next" >"$dotest/next"
|
|
|
|
this=$next
|
|
|
|
}
|
|
|
|
|
2006-08-12 23:16:47 +00:00
|
|
|
cannot_fallback () {
|
|
|
|
echo "$1"
|
2011-08-07 11:58:14 +00:00
|
|
|
gettextln "Cannot fall back to three-way merge."
|
2006-08-12 23:16:47 +00:00
|
|
|
exit 1
|
|
|
|
}
|
|
|
|
|
2005-10-07 10:44:18 +00:00
|
|
|
fall_back_3way () {
|
|
|
|
O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd`
|
|
|
|
|
|
|
|
rm -fr "$dotest"/patch-merge-*
|
|
|
|
mkdir "$dotest/patch-merge-tmp-dir"
|
|
|
|
|
|
|
|
# First see if the patch records the index info that we can use.
|
2012-02-23 05:55:06 +00:00
|
|
|
cmd="git apply $git_apply_opt --build-fake-ancestor" &&
|
|
|
|
cmd="$cmd "'"$dotest/patch-merge-tmp-index" "$dotest/patch"' &&
|
|
|
|
eval "$cmd" &&
|
2006-08-12 23:16:47 +00:00
|
|
|
GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
|
2007-07-03 05:52:14 +00:00
|
|
|
git write-tree >"$dotest/patch-merge-base+" ||
|
2011-05-21 18:43:48 +00:00
|
|
|
cannot_fallback "$(gettext "Repository lacks necessary blobs to fall back on 3-way merge.")"
|
2006-08-12 23:16:47 +00:00
|
|
|
|
2009-06-16 22:33:01 +00:00
|
|
|
say Using index info to reconstruct a base tree...
|
2012-02-23 05:55:06 +00:00
|
|
|
|
|
|
|
cmd='GIT_INDEX_FILE="$dotest/patch-merge-tmp-index"'
|
|
|
|
cmd="$cmd git apply --cached $git_apply_opt"' <"$dotest/patch"'
|
|
|
|
if eval "$cmd"
|
2005-10-07 10:44:18 +00:00
|
|
|
then
|
|
|
|
mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
|
|
|
|
mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
|
2006-08-12 23:16:47 +00:00
|
|
|
else
|
2011-05-21 18:43:48 +00:00
|
|
|
cannot_fallback "$(gettext "Did you hand edit your patch?
|
|
|
|
It does not apply to blobs recorded in its index.")"
|
2005-10-07 10:44:18 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
test -f "$dotest/patch-merge-index" &&
|
2007-07-03 05:52:14 +00:00
|
|
|
his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git write-tree) &&
|
2005-10-07 10:44:18 +00:00
|
|
|
orig_tree=$(cat "$dotest/patch-merge-base") &&
|
|
|
|
rm -fr "$dotest"/patch-merge-* || exit 1
|
|
|
|
|
2011-05-21 18:43:51 +00:00
|
|
|
say "$(gettext "Falling back to patching base and 3-way merge...")"
|
2005-10-07 10:44:18 +00:00
|
|
|
|
|
|
|
# This is not so wrong. Depending on which base we picked,
|
|
|
|
# orig_tree may be wildly different from ours, but his_tree
|
|
|
|
# has the same set of wildly different changes in parts the
|
2006-12-28 07:35:27 +00:00
|
|
|
# patch did not touch, so recursive ends up canceling them,
|
2005-10-07 10:44:18 +00:00
|
|
|
# saying that we reverted all those changes.
|
|
|
|
|
2008-04-15 19:56:50 +00:00
|
|
|
eval GITHEAD_$his_tree='"$FIRSTLINE"'
|
2006-12-28 07:35:27 +00:00
|
|
|
export GITHEAD_$his_tree
|
2009-06-16 22:33:01 +00:00
|
|
|
if test -n "$GIT_QUIET"
|
|
|
|
then
|
2010-10-13 18:36:36 +00:00
|
|
|
GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY
|
2009-06-16 22:33:01 +00:00
|
|
|
fi
|
2006-12-28 07:35:27 +00:00
|
|
|
git-merge-recursive $orig_tree -- HEAD $his_tree || {
|
2009-12-04 08:20:48 +00:00
|
|
|
git rerere $allow_rerere_autoupdate
|
2005-10-07 10:44:18 +00:00
|
|
|
echo Failed to merge in the changes.
|
|
|
|
exit 1
|
|
|
|
}
|
2006-12-28 07:35:27 +00:00
|
|
|
unset GITHEAD_$his_tree
|
2005-10-07 10:44:18 +00:00
|
|
|
}
|
|
|
|
|
2009-05-27 09:25:19 +00:00
|
|
|
clean_abort () {
|
|
|
|
test $# = 0 || echo >&2 "$@"
|
|
|
|
rm -fr "$dotest"
|
|
|
|
exit 1
|
|
|
|
}
|
|
|
|
|
2009-05-27 09:25:16 +00:00
|
|
|
patch_format=
|
|
|
|
|
|
|
|
check_patch_format () {
|
|
|
|
# early return if patch_format was set from the command line
|
|
|
|
if test -n "$patch_format"
|
|
|
|
then
|
|
|
|
return 0
|
|
|
|
fi
|
2009-05-27 21:20:12 +00:00
|
|
|
|
|
|
|
# we default to mbox format if input is from stdin and for
|
|
|
|
# directories
|
|
|
|
if test $# = 0 || test "x$1" = "x-" || test -d "$1"
|
|
|
|
then
|
|
|
|
patch_format=mbox
|
|
|
|
return 0
|
|
|
|
fi
|
|
|
|
|
2011-08-08 02:49:04 +00:00
|
|
|
# otherwise, check the first few non-blank lines of the first
|
|
|
|
# patch to try to detect its format
|
2009-05-27 21:20:12 +00:00
|
|
|
{
|
2011-08-08 02:49:04 +00:00
|
|
|
# Start from first line containing non-whitespace
|
|
|
|
l1=
|
|
|
|
while test -z "$l1"
|
|
|
|
do
|
2012-02-25 17:34:26 +00:00
|
|
|
read l1 || break
|
2011-08-08 02:49:04 +00:00
|
|
|
done
|
2009-05-27 21:20:12 +00:00
|
|
|
read l2
|
|
|
|
read l3
|
|
|
|
case "$l1" in
|
|
|
|
"From "* | "From: "*)
|
|
|
|
patch_format=mbox
|
|
|
|
;;
|
|
|
|
'# This series applies on GIT commit'*)
|
|
|
|
patch_format=stgit-series
|
|
|
|
;;
|
|
|
|
"# HG changeset patch")
|
|
|
|
patch_format=hg
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
# if the second line is empty and the third is
|
|
|
|
# a From, Author or Date entry, this is very
|
|
|
|
# likely an StGIT patch
|
|
|
|
case "$l2,$l3" in
|
|
|
|
,"From: "* | ,"Author: "* | ,"Date: "*)
|
|
|
|
patch_format=stgit
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
esac
|
2009-08-07 01:08:12 +00:00
|
|
|
if test -z "$patch_format" &&
|
|
|
|
test -n "$l1" &&
|
|
|
|
test -n "$l2" &&
|
|
|
|
test -n "$l3"
|
|
|
|
then
|
|
|
|
# This begins with three non-empty lines. Is this a
|
|
|
|
# piece of e-mail a-la RFC2822? Grab all the headers,
|
|
|
|
# discarding the indented remainder of folded lines,
|
|
|
|
# and see if it looks like that they all begin with the
|
|
|
|
# header field names...
|
2010-01-26 00:33:59 +00:00
|
|
|
tr -d '\015' <"$1" |
|
|
|
|
sed -n -e '/^$/q' -e '/^[ ]/d' -e p |
|
2009-11-23 23:56:32 +00:00
|
|
|
sane_egrep -v '^[!-9;-~]+:' >/dev/null ||
|
2009-08-07 01:08:12 +00:00
|
|
|
patch_format=mbox
|
|
|
|
fi
|
2009-05-27 09:25:19 +00:00
|
|
|
} < "$1" || clean_abort
|
2009-05-27 09:25:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
split_patches () {
|
|
|
|
case "$patch_format" in
|
|
|
|
mbox)
|
2010-02-27 14:20:27 +00:00
|
|
|
if test -n "$rebasing" || test t = "$keepcr"
|
2010-02-27 14:20:26 +00:00
|
|
|
then
|
|
|
|
keep_cr=--keep-cr
|
|
|
|
else
|
|
|
|
keep_cr=
|
|
|
|
fi
|
2009-08-05 03:31:59 +00:00
|
|
|
git mailsplit -d"$prec" -o"$dotest" -b $keep_cr -- "$@" > "$dotest/last" ||
|
2009-05-27 09:25:19 +00:00
|
|
|
clean_abort
|
2009-05-27 09:25:16 +00:00
|
|
|
;;
|
2009-05-27 09:25:18 +00:00
|
|
|
stgit-series)
|
|
|
|
if test $# -ne 1
|
|
|
|
then
|
2011-05-21 18:43:49 +00:00
|
|
|
clean_abort "$(gettext "Only one StGIT patch series can be applied at once")"
|
2009-05-27 09:25:18 +00:00
|
|
|
fi
|
|
|
|
series_dir=`dirname "$1"`
|
|
|
|
series_file="$1"
|
|
|
|
shift
|
|
|
|
{
|
|
|
|
set x
|
|
|
|
while read filename
|
|
|
|
do
|
|
|
|
set "$@" "$series_dir/$filename"
|
|
|
|
done
|
|
|
|
# remove the safety x
|
|
|
|
shift
|
|
|
|
# remove the arg coming from the first-line comment
|
|
|
|
shift
|
2009-05-27 09:25:19 +00:00
|
|
|
} < "$series_file" || clean_abort
|
2009-05-27 09:25:18 +00:00
|
|
|
# set the patch format appropriately
|
|
|
|
patch_format=stgit
|
|
|
|
# now handle the actual StGIT patches
|
|
|
|
split_patches "$@"
|
|
|
|
;;
|
|
|
|
stgit)
|
|
|
|
this=0
|
|
|
|
for stgit in "$@"
|
|
|
|
do
|
|
|
|
this=`expr "$this" + 1`
|
|
|
|
msgnum=`printf "%0${prec}d" $this`
|
|
|
|
# Perl version of StGIT parse_patch. The first nonemptyline
|
|
|
|
# not starting with Author, From or Date is the
|
|
|
|
# subject, and the body starts with the next nonempty
|
|
|
|
# line not starting with Author, From or Date
|
|
|
|
perl -ne 'BEGIN { $subject = 0 }
|
|
|
|
if ($subject > 1) { print ; }
|
|
|
|
elsif (/^\s+$/) { next ; }
|
2011-08-29 16:44:07 +00:00
|
|
|
elsif (/^Author:/) { s/Author/From/ ; print ;}
|
2009-05-27 09:25:18 +00:00
|
|
|
elsif (/^(From|Date)/) { print ; }
|
|
|
|
elsif ($subject) {
|
|
|
|
$subject = 2 ;
|
|
|
|
print "\n" ;
|
|
|
|
print ;
|
|
|
|
} else {
|
|
|
|
print "Subject: ", $_ ;
|
|
|
|
$subject = 1;
|
|
|
|
}
|
2009-05-27 09:25:19 +00:00
|
|
|
' < "$stgit" > "$dotest/$msgnum" || clean_abort
|
2009-05-27 09:25:18 +00:00
|
|
|
done
|
|
|
|
echo "$this" > "$dotest/last"
|
|
|
|
this=
|
|
|
|
msgnum=
|
|
|
|
;;
|
2011-08-29 16:44:06 +00:00
|
|
|
hg)
|
|
|
|
this=0
|
|
|
|
for hg in "$@"
|
|
|
|
do
|
|
|
|
this=$(( $this + 1 ))
|
|
|
|
msgnum=$(printf "%0${prec}d" $this)
|
|
|
|
# hg stores changeset metadata in #-commented lines preceding
|
|
|
|
# the commit message and diff(s). The only metadata we care about
|
|
|
|
# are the User and Date (Node ID and Parent are hashes which are
|
|
|
|
# only relevant to the hg repository and thus not useful to us)
|
|
|
|
# Since we cannot guarantee that the commit message is in
|
|
|
|
# git-friendly format, we put no Subject: line and just consume
|
|
|
|
# all of the message as the body
|
|
|
|
perl -M'POSIX qw(strftime)' -ne 'BEGIN { $subject = 0 }
|
|
|
|
if ($subject) { print ; }
|
|
|
|
elsif (/^\# User /) { s/\# User/From:/ ; print ; }
|
|
|
|
elsif (/^\# Date /) {
|
|
|
|
my ($hashsign, $str, $time, $tz) = split ;
|
|
|
|
$tz = sprintf "%+05d", (0-$tz)/36;
|
|
|
|
print "Date: " .
|
|
|
|
strftime("%a, %d %b %Y %H:%M:%S ",
|
|
|
|
localtime($time))
|
|
|
|
. "$tz\n";
|
|
|
|
} elsif (/^\# /) { next ; }
|
|
|
|
else {
|
|
|
|
print "\n", $_ ;
|
|
|
|
$subject = 1;
|
|
|
|
}
|
|
|
|
' <"$hg" >"$dotest/$msgnum" || clean_abort
|
|
|
|
done
|
|
|
|
echo "$this" >"$dotest/last"
|
|
|
|
this=
|
|
|
|
msgnum=
|
|
|
|
;;
|
2009-05-27 09:25:16 +00:00
|
|
|
*)
|
2011-08-29 15:22:06 +00:00
|
|
|
if test -n "$patch_format"
|
|
|
|
then
|
2011-05-21 18:43:49 +00:00
|
|
|
clean_abort "$(eval_gettext "Patch format \$patch_format is not supported.")"
|
2009-08-07 01:08:13 +00:00
|
|
|
else
|
2011-05-21 18:43:49 +00:00
|
|
|
clean_abort "$(gettext "Patch format detection failed.")"
|
2009-08-07 01:08:13 +00:00
|
|
|
fi
|
2009-05-27 09:25:16 +00:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
}
|
|
|
|
|
2005-10-07 10:44:18 +00:00
|
|
|
prec=4
|
2008-07-21 10:51:02 +00:00
|
|
|
dotest="$GIT_DIR/rebase-apply"
|
2010-02-27 14:20:26 +00:00
|
|
|
sign= utf8=t keep= keepcr= skip= interactive= resolved= rebasing= abort=
|
2009-11-20 16:12:47 +00:00
|
|
|
resolvemsg= resume= scissors= no_inbody_headers=
|
2007-02-08 13:57:08 +00:00
|
|
|
git_apply_opt=
|
2009-01-23 00:14:58 +00:00
|
|
|
committer_date_is_author_date=
|
2009-01-24 01:18:02 +00:00
|
|
|
ignore_date=
|
2009-12-04 08:20:48 +00:00
|
|
|
allow_rerere_autoupdate=
|
2005-10-07 10:44:18 +00:00
|
|
|
|
2010-02-27 14:20:27 +00:00
|
|
|
if test "$(git config --bool --get am.keepcr)" = true
|
|
|
|
then
|
|
|
|
keepcr=t
|
|
|
|
fi
|
|
|
|
|
2007-09-23 20:42:08 +00:00
|
|
|
while test $# != 0
|
2005-10-07 10:44:18 +00:00
|
|
|
do
|
|
|
|
case "$1" in
|
2007-11-04 10:30:57 +00:00
|
|
|
-i|--interactive)
|
|
|
|
interactive=t ;;
|
|
|
|
-b|--binary)
|
2012-03-13 18:38:27 +00:00
|
|
|
echo >&2 "The $1 option has been a no-op for long time, and"
|
|
|
|
echo >&2 "it will be removed. Please do not use it anymore."
|
2012-03-12 21:47:19 +00:00
|
|
|
;;
|
2007-11-04 10:30:57 +00:00
|
|
|
-3|--3way)
|
|
|
|
threeway=t ;;
|
2007-11-06 20:33:58 +00:00
|
|
|
-s|--signoff)
|
2007-11-04 10:30:57 +00:00
|
|
|
sign=t ;;
|
|
|
|
-u|--utf8)
|
|
|
|
utf8=t ;; # this is now default
|
|
|
|
--no-utf8)
|
|
|
|
utf8= ;;
|
|
|
|
-k|--keep)
|
|
|
|
keep=t ;;
|
2012-01-16 10:53:00 +00:00
|
|
|
--keep-non-patch)
|
|
|
|
keep=b ;;
|
2009-08-27 04:36:05 +00:00
|
|
|
-c|--scissors)
|
|
|
|
scissors=t ;;
|
|
|
|
--no-scissors)
|
|
|
|
scissors=f ;;
|
2010-02-11 22:27:14 +00:00
|
|
|
-r|--resolved|--continue)
|
2007-11-04 10:30:57 +00:00
|
|
|
resolved=t ;;
|
|
|
|
--skip)
|
|
|
|
skip=t ;;
|
2008-07-16 10:39:10 +00:00
|
|
|
--abort)
|
|
|
|
abort=t ;;
|
2008-03-04 08:25:06 +00:00
|
|
|
--rebasing)
|
2009-11-20 16:12:47 +00:00
|
|
|
rebasing=t threeway=t keep=t scissors=f no_inbody_headers=t ;;
|
2007-11-04 10:30:57 +00:00
|
|
|
-d|--dotest)
|
2011-05-21 18:43:47 +00:00
|
|
|
die "$(gettext "-d option is no longer supported. Do not use.")"
|
2008-03-04 08:25:05 +00:00
|
|
|
;;
|
2007-11-04 10:30:57 +00:00
|
|
|
--resolvemsg)
|
|
|
|
shift; resolvemsg=$1 ;;
|
2011-08-03 09:37:29 +00:00
|
|
|
--whitespace|--directory|--exclude)
|
2009-01-12 06:21:48 +00:00
|
|
|
git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;;
|
2007-11-04 10:30:57 +00:00
|
|
|
-C|-p)
|
2009-01-12 06:21:48 +00:00
|
|
|
git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;
|
2009-05-27 09:25:16 +00:00
|
|
|
--patch-format)
|
|
|
|
shift ; patch_format="$1" ;;
|
2009-08-04 11:16:49 +00:00
|
|
|
--reject|--ignore-whitespace|--ignore-space-change)
|
2009-01-23 00:31:21 +00:00
|
|
|
git_apply_opt="$git_apply_opt $1" ;;
|
2009-01-23 00:14:58 +00:00
|
|
|
--committer-date-is-author-date)
|
|
|
|
committer_date_is_author_date=t ;;
|
2009-01-24 01:18:02 +00:00
|
|
|
--ignore-date)
|
|
|
|
ignore_date=t ;;
|
2009-12-04 08:20:48 +00:00
|
|
|
--rerere-autoupdate|--no-rerere-autoupdate)
|
|
|
|
allow_rerere_autoupdate="$1" ;;
|
2009-06-16 22:33:01 +00:00
|
|
|
-q|--quiet)
|
|
|
|
GIT_QUIET=t ;;
|
2010-02-27 14:20:26 +00:00
|
|
|
--keep-cr)
|
|
|
|
keepcr=t ;;
|
2010-02-27 14:20:27 +00:00
|
|
|
--no-keep-cr)
|
|
|
|
keepcr=f ;;
|
2005-10-07 10:44:18 +00:00
|
|
|
--)
|
2007-11-04 10:30:57 +00:00
|
|
|
shift; break ;;
|
2005-10-07 10:44:18 +00:00
|
|
|
*)
|
2007-11-04 10:30:57 +00:00
|
|
|
usage ;;
|
2005-10-07 10:44:18 +00:00
|
|
|
esac
|
2007-11-04 10:30:57 +00:00
|
|
|
shift
|
2005-10-07 10:44:18 +00:00
|
|
|
done
|
|
|
|
|
2005-11-16 08:19:32 +00:00
|
|
|
# If the dotest directory exists, but we have finished applying all the
|
|
|
|
# patches in them, clear it out.
|
2005-10-07 10:44:18 +00:00
|
|
|
if test -d "$dotest" &&
|
|
|
|
last=$(cat "$dotest/last") &&
|
|
|
|
next=$(cat "$dotest/next") &&
|
|
|
|
test $# != 0 &&
|
|
|
|
test "$next" -gt "$last"
|
|
|
|
then
|
|
|
|
rm -fr "$dotest"
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -d "$dotest"
|
|
|
|
then
|
2008-07-16 10:39:10 +00:00
|
|
|
case "$#,$skip$resolved$abort" in
|
2006-09-16 06:19:02 +00:00
|
|
|
0,*t*)
|
|
|
|
# Explicit resume command and we do not have file, so
|
|
|
|
# we are happy.
|
|
|
|
: ;;
|
|
|
|
0,)
|
|
|
|
# No file input but without resume parameters; catch
|
|
|
|
# user error to feed us a patch from standard input
|
2008-03-04 08:25:05 +00:00
|
|
|
# when there is already $dotest. This is somewhat
|
2006-09-16 06:19:02 +00:00
|
|
|
# unreliable -- stdin could be /dev/null for example
|
|
|
|
# and the caller did not intend to feed us a patch but
|
|
|
|
# wanted to continue unattended.
|
2009-01-28 15:03:10 +00:00
|
|
|
test -t 0
|
2006-09-16 06:19:02 +00:00
|
|
|
;;
|
|
|
|
*)
|
|
|
|
false
|
|
|
|
;;
|
|
|
|
esac ||
|
2011-05-21 18:43:47 +00:00
|
|
|
die "$(eval_gettext "previous rebase directory \$dotest still exists but mbox given.")"
|
2005-10-26 06:35:37 +00:00
|
|
|
resume=yes
|
2008-07-16 10:39:10 +00:00
|
|
|
|
2008-07-21 13:39:06 +00:00
|
|
|
case "$skip,$abort" in
|
2009-02-26 19:24:29 +00:00
|
|
|
t,t)
|
2011-05-21 18:43:47 +00:00
|
|
|
die "$(gettext "Please make up your mind. --skip or --abort?")"
|
2009-02-26 19:24:29 +00:00
|
|
|
;;
|
2008-07-21 13:39:06 +00:00
|
|
|
t,)
|
|
|
|
git rerere clear
|
|
|
|
git read-tree --reset -u HEAD HEAD
|
|
|
|
orig_head=$(cat "$GIT_DIR/ORIG_HEAD")
|
|
|
|
git reset HEAD
|
|
|
|
git update-ref ORIG_HEAD $orig_head
|
|
|
|
;;
|
|
|
|
,t)
|
2009-02-26 19:24:29 +00:00
|
|
|
if test -f "$dotest/rebasing"
|
|
|
|
then
|
|
|
|
exec git rebase --abort
|
|
|
|
fi
|
2008-07-16 10:39:10 +00:00
|
|
|
git rerere clear
|
2010-12-21 18:35:53 +00:00
|
|
|
if safe_to_abort
|
|
|
|
then
|
2009-02-26 09:52:53 +00:00
|
|
|
git read-tree --reset -u HEAD ORIG_HEAD
|
|
|
|
git reset ORIG_HEAD
|
2010-12-21 18:35:53 +00:00
|
|
|
fi
|
2008-07-16 10:39:10 +00:00
|
|
|
rm -fr "$dotest"
|
|
|
|
exit ;;
|
|
|
|
esac
|
2009-02-26 09:52:53 +00:00
|
|
|
rm -f "$dotest/dirtyindex"
|
2005-10-07 10:44:18 +00:00
|
|
|
else
|
2008-07-16 10:39:10 +00:00
|
|
|
# Make sure we are not given --skip, --resolved, nor --abort
|
|
|
|
test "$skip$resolved$abort" = "" ||
|
2011-05-21 18:43:47 +00:00
|
|
|
die "$(gettext "Resolve operation not in progress, we are not resuming.")"
|
2005-10-07 10:44:18 +00:00
|
|
|
|
|
|
|
# Start afresh.
|
|
|
|
mkdir -p "$dotest" || exit
|
|
|
|
|
2008-03-04 08:25:04 +00:00
|
|
|
if test -n "$prefix" && test $# != 0
|
|
|
|
then
|
|
|
|
first=t
|
|
|
|
for arg
|
|
|
|
do
|
|
|
|
test -n "$first" && {
|
|
|
|
set x
|
|
|
|
first=
|
|
|
|
}
|
2010-09-30 13:24:07 +00:00
|
|
|
if is_absolute_path "$arg"
|
|
|
|
then
|
|
|
|
set "$@" "$arg"
|
|
|
|
else
|
|
|
|
set "$@" "$prefix$arg"
|
|
|
|
fi
|
2008-03-04 08:25:04 +00:00
|
|
|
done
|
|
|
|
shift
|
|
|
|
fi
|
2009-05-27 09:25:16 +00:00
|
|
|
|
|
|
|
check_patch_format "$@"
|
|
|
|
|
|
|
|
split_patches "$@"
|
2005-10-07 10:44:18 +00:00
|
|
|
|
2009-08-27 04:36:05 +00:00
|
|
|
# -i can and must be given when resuming; everything
|
|
|
|
# else is kept
|
2008-12-05 19:19:43 +00:00
|
|
|
echo " $git_apply_opt" >"$dotest/apply-opt"
|
2008-12-04 23:38:27 +00:00
|
|
|
echo "$threeway" >"$dotest/threeway"
|
2005-10-07 10:44:18 +00:00
|
|
|
echo "$sign" >"$dotest/sign"
|
|
|
|
echo "$utf8" >"$dotest/utf8"
|
|
|
|
echo "$keep" >"$dotest/keep"
|
2009-08-27 04:36:05 +00:00
|
|
|
echo "$scissors" >"$dotest/scissors"
|
2009-11-20 16:12:47 +00:00
|
|
|
echo "$no_inbody_headers" >"$dotest/no_inbody_headers"
|
2009-06-16 22:33:01 +00:00
|
|
|
echo "$GIT_QUIET" >"$dotest/quiet"
|
2005-10-07 10:44:18 +00:00
|
|
|
echo 1 >"$dotest/next"
|
2008-03-04 08:25:06 +00:00
|
|
|
if test -n "$rebasing"
|
|
|
|
then
|
|
|
|
: >"$dotest/rebasing"
|
|
|
|
else
|
|
|
|
: >"$dotest/applying"
|
2009-04-10 00:34:42 +00:00
|
|
|
if test -n "$HAS_HEAD"
|
|
|
|
then
|
|
|
|
git update-ref ORIG_HEAD HEAD
|
|
|
|
else
|
|
|
|
git update-ref -d ORIG_HEAD >/dev/null 2>&1
|
|
|
|
fi
|
2008-03-04 08:25:06 +00:00
|
|
|
fi
|
2005-10-07 10:44:18 +00:00
|
|
|
fi
|
|
|
|
|
2011-08-16 00:13:07 +00:00
|
|
|
git update-index -q --refresh
|
|
|
|
|
2005-11-16 08:19:32 +00:00
|
|
|
case "$resolved" in
|
|
|
|
'')
|
2009-04-10 00:34:42 +00:00
|
|
|
case "$HAS_HEAD" in
|
|
|
|
'')
|
|
|
|
files=$(git ls-files) ;;
|
|
|
|
?*)
|
|
|
|
files=$(git diff-index --cached --name-only HEAD --) ;;
|
|
|
|
esac || exit
|
2009-02-26 09:52:53 +00:00
|
|
|
if test "$files"
|
|
|
|
then
|
2009-04-10 00:34:42 +00:00
|
|
|
test -n "$HAS_HEAD" && : >"$dotest/dirtyindex"
|
2011-05-21 18:43:47 +00:00
|
|
|
die "$(eval_gettext "Dirty index: cannot apply patches (dirty: \$files)")"
|
2009-02-26 09:52:53 +00:00
|
|
|
fi
|
2005-11-16 08:19:32 +00:00
|
|
|
esac
|
|
|
|
|
2012-01-16 10:53:00 +00:00
|
|
|
# Now, decide what command line options we will give to the git
|
|
|
|
# commands we invoke, based on the result of parsing command line
|
|
|
|
# options and previous invocation state stored in $dotest/ files.
|
|
|
|
|
2005-10-07 10:44:18 +00:00
|
|
|
if test "$(cat "$dotest/utf8")" = t
|
|
|
|
then
|
|
|
|
utf8=-u
|
2007-01-10 05:31:36 +00:00
|
|
|
else
|
|
|
|
utf8=-n
|
2005-10-07 10:44:18 +00:00
|
|
|
fi
|
2012-01-16 10:53:00 +00:00
|
|
|
keep=$(cat "$dotest/keep")
|
|
|
|
case "$keep" in
|
|
|
|
t)
|
|
|
|
keep=-k ;;
|
|
|
|
b)
|
|
|
|
keep=-b ;;
|
|
|
|
*)
|
|
|
|
keep= ;;
|
|
|
|
esac
|
2009-08-27 04:36:05 +00:00
|
|
|
case "$(cat "$dotest/scissors")" in
|
|
|
|
t)
|
|
|
|
scissors=--scissors ;;
|
|
|
|
f)
|
|
|
|
scissors=--no-scissors ;;
|
|
|
|
esac
|
2009-11-20 16:12:47 +00:00
|
|
|
if test "$(cat "$dotest/no_inbody_headers")" = t
|
|
|
|
then
|
|
|
|
no_inbody_headers=--no-inbody-headers
|
|
|
|
else
|
|
|
|
no_inbody_headers=
|
|
|
|
fi
|
2009-06-16 22:33:01 +00:00
|
|
|
if test "$(cat "$dotest/quiet")" = t
|
|
|
|
then
|
|
|
|
GIT_QUIET=t
|
|
|
|
fi
|
2008-12-04 23:38:27 +00:00
|
|
|
if test "$(cat "$dotest/threeway")" = t
|
|
|
|
then
|
|
|
|
threeway=t
|
|
|
|
fi
|
2008-12-05 19:19:43 +00:00
|
|
|
git_apply_opt=$(cat "$dotest/apply-opt")
|
2005-10-07 10:44:18 +00:00
|
|
|
if test "$(cat "$dotest/sign")" = t
|
|
|
|
then
|
2008-07-30 17:48:33 +00:00
|
|
|
SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e '
|
2005-10-07 10:44:18 +00:00
|
|
|
s/>.*/>/
|
|
|
|
s/^/Signed-off-by: /'
|
|
|
|
`
|
|
|
|
else
|
|
|
|
SIGNOFF=
|
|
|
|
fi
|
|
|
|
|
|
|
|
last=`cat "$dotest/last"`
|
|
|
|
this=`cat "$dotest/next"`
|
|
|
|
if test "$skip" = t
|
|
|
|
then
|
|
|
|
this=`expr "$this" + 1`
|
2005-12-17 06:01:06 +00:00
|
|
|
resume=
|
2005-10-07 10:44:18 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
while test "$this" -le "$last"
|
|
|
|
do
|
|
|
|
msgnum=`printf "%0${prec}d" $this`
|
|
|
|
next=`expr "$this" + 1`
|
|
|
|
test -f "$dotest/$msgnum" || {
|
2005-12-17 06:01:06 +00:00
|
|
|
resume=
|
2005-10-07 10:44:18 +00:00
|
|
|
go_next
|
|
|
|
continue
|
|
|
|
}
|
2005-11-16 08:19:32 +00:00
|
|
|
|
|
|
|
# If we are not resuming, parse and extract the patch information
|
|
|
|
# into separate files:
|
|
|
|
# - info records the authorship and title
|
|
|
|
# - msg is the rest of commit log message
|
|
|
|
# - patch is the patch body.
|
|
|
|
#
|
|
|
|
# When we are resuming, these files are either already prepared
|
|
|
|
# by the user, or the user can tell us to do so by --resolved flag.
|
2005-10-26 06:35:37 +00:00
|
|
|
case "$resume" in
|
|
|
|
'')
|
2009-11-20 16:12:47 +00:00
|
|
|
git mailinfo $keep $no_inbody_headers $scissors $utf8 "$dotest/msg" "$dotest/patch" \
|
2005-10-26 06:35:37 +00:00
|
|
|
<"$dotest/$msgnum" >"$dotest/info" ||
|
|
|
|
stop_here $this
|
2007-07-24 00:02:25 +00:00
|
|
|
|
|
|
|
# skip pine's internal folder data
|
2009-11-23 23:56:32 +00:00
|
|
|
sane_grep '^Author: Mail System Internal Data$' \
|
2007-07-24 00:02:25 +00:00
|
|
|
<"$dotest"/info >/dev/null &&
|
|
|
|
go_next && continue
|
|
|
|
|
2008-07-16 01:33:44 +00:00
|
|
|
test -s "$dotest/patch" || {
|
2011-08-07 11:58:14 +00:00
|
|
|
eval_gettextln "Patch is empty. Was it split wrong?
|
2011-05-21 18:43:45 +00:00
|
|
|
If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
|
2011-08-07 11:58:14 +00:00
|
|
|
To restore the original branch and stop patching run \"\$cmdline --abort\"."
|
2007-03-12 19:52:04 +00:00
|
|
|
stop_here $this
|
|
|
|
}
|
2010-06-16 07:12:40 +00:00
|
|
|
rm -f "$dotest/original-commit" "$dotest/author-script"
|
2008-04-16 19:50:48 +00:00
|
|
|
if test -f "$dotest/rebasing" &&
|
|
|
|
commit=$(sed -e 's/^From \([0-9a-f]*\) .*/\1/' \
|
|
|
|
-e q "$dotest/$msgnum") &&
|
|
|
|
test "$(git cat-file -t "$commit")" = commit
|
|
|
|
then
|
|
|
|
git cat-file commit "$commit" |
|
|
|
|
sed -e '1,/^$/d' >"$dotest/msg-clean"
|
2010-03-12 17:04:29 +00:00
|
|
|
echo "$commit" > "$dotest/original-commit"
|
2010-06-16 07:12:40 +00:00
|
|
|
get_author_ident_from_commit "$commit" > "$dotest/author-script"
|
2008-04-16 19:50:48 +00:00
|
|
|
else
|
2009-11-27 23:06:37 +00:00
|
|
|
{
|
|
|
|
sed -n '/^Subject/ s/Subject: //p' "$dotest/info"
|
|
|
|
echo
|
|
|
|
cat "$dotest/msg"
|
|
|
|
} |
|
|
|
|
git stripspace > "$dotest/msg-clean"
|
2008-04-16 19:50:48 +00:00
|
|
|
fi
|
2005-10-26 06:35:37 +00:00
|
|
|
;;
|
|
|
|
esac
|
2005-10-07 10:44:18 +00:00
|
|
|
|
2010-06-16 07:12:40 +00:00
|
|
|
if test -f "$dotest/author-script"
|
|
|
|
then
|
|
|
|
eval $(cat "$dotest/author-script")
|
|
|
|
else
|
|
|
|
GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
|
|
|
|
GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
|
|
|
|
GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
|
|
|
|
fi
|
2005-12-15 00:31:06 +00:00
|
|
|
|
2007-12-05 21:16:35 +00:00
|
|
|
if test -z "$GIT_AUTHOR_EMAIL"
|
2005-12-15 00:31:06 +00:00
|
|
|
then
|
2011-08-07 11:58:14 +00:00
|
|
|
gettextln "Patch does not have a valid e-mail address."
|
2005-12-15 00:31:06 +00:00
|
|
|
stop_here $this
|
|
|
|
fi
|
|
|
|
|
2005-10-21 05:31:56 +00:00
|
|
|
export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
|
2005-10-07 10:44:18 +00:00
|
|
|
|
2005-11-08 08:41:37 +00:00
|
|
|
case "$resume" in
|
|
|
|
'')
|
|
|
|
if test '' != "$SIGNOFF"
|
|
|
|
then
|
2005-10-07 10:44:18 +00:00
|
|
|
LAST_SIGNED_OFF_BY=`
|
2005-11-08 08:41:37 +00:00
|
|
|
sed -ne '/^Signed-off-by: /p' \
|
|
|
|
"$dotest/msg-clean" |
|
2008-03-12 21:34:34 +00:00
|
|
|
sed -ne '$p'
|
2005-10-07 10:44:18 +00:00
|
|
|
`
|
2005-11-08 08:41:37 +00:00
|
|
|
ADD_SIGNOFF=`
|
|
|
|
test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || {
|
2005-10-07 10:44:18 +00:00
|
|
|
test '' = "$LAST_SIGNED_OFF_BY" && echo
|
|
|
|
echo "$SIGNOFF"
|
2005-11-08 08:41:37 +00:00
|
|
|
}`
|
|
|
|
else
|
2005-10-07 10:44:18 +00:00
|
|
|
ADD_SIGNOFF=
|
2005-11-08 08:41:37 +00:00
|
|
|
fi
|
|
|
|
{
|
2005-10-07 10:44:18 +00:00
|
|
|
if test -s "$dotest/msg-clean"
|
|
|
|
then
|
|
|
|
cat "$dotest/msg-clean"
|
|
|
|
fi
|
|
|
|
if test '' != "$ADD_SIGNOFF"
|
|
|
|
then
|
|
|
|
echo "$ADD_SIGNOFF"
|
|
|
|
fi
|
2005-11-08 08:41:37 +00:00
|
|
|
} >"$dotest/final-commit"
|
|
|
|
;;
|
2005-11-16 08:19:32 +00:00
|
|
|
*)
|
2006-02-24 06:14:47 +00:00
|
|
|
case "$resolved$interactive" in
|
2005-11-16 08:19:32 +00:00
|
|
|
tt)
|
|
|
|
# This is used only for interactive view option.
|
2007-11-29 00:15:04 +00:00
|
|
|
git diff-index -p --cached HEAD -- >"$dotest/patch"
|
2005-11-16 08:19:32 +00:00
|
|
|
;;
|
|
|
|
esac
|
2005-11-08 08:41:37 +00:00
|
|
|
esac
|
2005-10-07 10:44:18 +00:00
|
|
|
|
2005-11-08 08:41:37 +00:00
|
|
|
resume=
|
2005-10-07 10:44:18 +00:00
|
|
|
if test "$interactive" = t
|
|
|
|
then
|
2005-10-13 01:31:41 +00:00
|
|
|
test -t 0 ||
|
2011-05-21 18:43:47 +00:00
|
|
|
die "$(gettext "cannot be interactive without stdin connected to a terminal.")"
|
2005-10-07 10:44:18 +00:00
|
|
|
action=again
|
|
|
|
while test "$action" = again
|
|
|
|
do
|
2011-08-07 11:58:14 +00:00
|
|
|
gettextln "Commit Body is:"
|
2005-10-07 10:44:18 +00:00
|
|
|
echo "--------------------------"
|
|
|
|
cat "$dotest/final-commit"
|
|
|
|
echo "--------------------------"
|
2011-05-21 18:43:50 +00:00
|
|
|
# TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
|
|
|
|
# in your translation. The program will only accept English
|
|
|
|
# input at this point.
|
|
|
|
gettext "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
|
2005-10-07 10:44:18 +00:00
|
|
|
read reply
|
|
|
|
case "$reply" in
|
2005-10-26 06:43:59 +00:00
|
|
|
[yY]*) action=yes ;;
|
|
|
|
[aA]*) action=yes interactive= ;;
|
|
|
|
[nN]*) action=skip ;;
|
2007-07-20 05:09:35 +00:00
|
|
|
[eE]*) git_editor "$dotest/final-commit"
|
2005-10-07 10:44:18 +00:00
|
|
|
action=again ;;
|
2005-10-26 06:43:59 +00:00
|
|
|
[vV]*) action=again
|
2010-02-15 05:04:13 +00:00
|
|
|
git_pager "$dotest/patch" ;;
|
2005-10-26 06:43:59 +00:00
|
|
|
*) action=again ;;
|
2005-10-07 10:44:18 +00:00
|
|
|
esac
|
|
|
|
done
|
|
|
|
else
|
|
|
|
action=yes
|
|
|
|
fi
|
2010-06-02 08:33:37 +00:00
|
|
|
|
|
|
|
if test -f "$dotest/final-commit"
|
|
|
|
then
|
|
|
|
FIRSTLINE=$(sed 1q "$dotest/final-commit")
|
|
|
|
else
|
|
|
|
FIRSTLINE=""
|
|
|
|
fi
|
2005-10-07 10:44:18 +00:00
|
|
|
|
|
|
|
if test $action = skip
|
|
|
|
then
|
|
|
|
go_next
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -x "$GIT_DIR"/hooks/applypatch-msg
|
|
|
|
then
|
|
|
|
"$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" ||
|
|
|
|
stop_here $this
|
|
|
|
fi
|
|
|
|
|
2011-05-21 18:43:52 +00:00
|
|
|
say "$(eval_gettext "Applying: \$FIRSTLINE")"
|
2005-10-07 10:44:18 +00:00
|
|
|
|
2005-11-16 08:19:32 +00:00
|
|
|
case "$resolved" in
|
|
|
|
'')
|
2009-06-16 22:32:58 +00:00
|
|
|
# When we are allowed to fall back to 3-way later, don't give
|
|
|
|
# false errors during the initial attempt.
|
|
|
|
squelch=
|
|
|
|
if test "$threeway" = t
|
|
|
|
then
|
|
|
|
squelch='>/dev/null 2>&1 '
|
|
|
|
fi
|
|
|
|
eval "git apply $squelch$git_apply_opt"' --index "$dotest/patch"'
|
2005-11-16 08:19:32 +00:00
|
|
|
apply_status=$?
|
|
|
|
;;
|
|
|
|
t)
|
|
|
|
# Resolved means the user did all the hard work, and
|
|
|
|
# we do not have to do any patch application. Just
|
|
|
|
# trust what the user has in the index file and the
|
|
|
|
# working tree.
|
|
|
|
resolved=
|
2007-11-29 00:15:04 +00:00
|
|
|
git diff-index --quiet --cached HEAD -- && {
|
2011-08-07 11:58:14 +00:00
|
|
|
gettextln "No changes - did you forget to use 'git add'?
|
2011-05-21 18:43:44 +00:00
|
|
|
If there is nothing left to stage, chances are that something else
|
2011-08-07 11:58:14 +00:00
|
|
|
already introduced the same changes; you might want to skip this patch."
|
2006-05-02 12:32:43 +00:00
|
|
|
stop_here_user_resolve $this
|
2007-03-25 00:56:13 +00:00
|
|
|
}
|
2007-07-03 05:52:14 +00:00
|
|
|
unmerged=$(git ls-files -u)
|
2006-04-28 09:32:44 +00:00
|
|
|
if test -n "$unmerged"
|
|
|
|
then
|
2011-08-07 11:58:14 +00:00
|
|
|
gettextln "You still have unmerged paths in your index
|
|
|
|
did you forget to use 'git add'?"
|
2006-05-02 12:32:43 +00:00
|
|
|
stop_here_user_resolve $this
|
2006-04-28 09:32:44 +00:00
|
|
|
fi
|
2005-11-16 08:19:32 +00:00
|
|
|
apply_status=0
|
2007-07-06 12:05:59 +00:00
|
|
|
git rerere
|
2005-11-16 08:19:32 +00:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
am -3: recover the diagnostic messages for corrupt patches
"git am -3" first tries to apply the patch without any extra trick, and
applies it to a synthesized tree for 3-way merge after the first attempt
fails. "git apply" exits with status 1 for a patch that is well-formed
but is not applicable (and it dies on other errors with non-zereo, non-1
status) and has an optimization to fall back to the 3-way merge only in
the case.
An earlier patch 3ddd170 (am: suppress apply errors when using 3-way,
2009-06-16) squelched diagnostic messages from the first attempt, not to
be shown to the end user. This worked reasonably well if the reason the
first application failed was because the patch was made against a wrong
version.
When the patch is corrupt (e.g. line-wrapped or leading whitespaces got
dropped), however, because the second patch application is not even
attempted, the error message from the first application is never shown
and is forever lost. This message is necessary to locate where the patch
is corrupt and fix it up.
We could fix this issue by reverting 3dd170, or keeping the error message
to somewhere and showing it, but because this is an error codepath, the
easiest is to disable the optimization. The second patch application is
attempted even when the input is corrupt, and it will notice, diagnose,
and stop with an error message.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-04-09 23:58:28 +00:00
|
|
|
if test $apply_status != 0 && test "$threeway" = t
|
2005-10-07 10:44:18 +00:00
|
|
|
then
|
2005-10-13 18:46:43 +00:00
|
|
|
if (fall_back_3way)
|
2005-10-07 10:44:18 +00:00
|
|
|
then
|
2005-10-13 18:46:43 +00:00
|
|
|
# Applying the patch to an earlier tree and merging the
|
|
|
|
# result may have produced the same tree as ours.
|
2007-11-29 00:15:04 +00:00
|
|
|
git diff-index --quiet --cached HEAD -- && {
|
2011-05-21 18:43:52 +00:00
|
|
|
say "$(gettext "No changes -- Patch already applied.")"
|
2007-03-25 00:56:13 +00:00
|
|
|
go_next
|
|
|
|
continue
|
|
|
|
}
|
2005-10-13 18:46:43 +00:00
|
|
|
# clear apply_status -- we have successfully merged.
|
|
|
|
apply_status=0
|
2005-10-07 10:44:18 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test $apply_status != 0
|
|
|
|
then
|
2011-08-07 11:58:14 +00:00
|
|
|
eval_gettextln 'Patch failed at $msgnum $FIRSTLINE'
|
2006-05-02 12:32:43 +00:00
|
|
|
stop_here_user_resolve $this
|
2005-10-07 10:44:18 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test -x "$GIT_DIR"/hooks/pre-applypatch
|
|
|
|
then
|
|
|
|
"$GIT_DIR"/hooks/pre-applypatch || stop_here $this
|
|
|
|
fi
|
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
tree=$(git write-tree) &&
|
2009-01-23 00:14:58 +00:00
|
|
|
commit=$(
|
2009-01-24 01:18:02 +00:00
|
|
|
if test -n "$ignore_date"
|
|
|
|
then
|
|
|
|
GIT_AUTHOR_DATE=
|
|
|
|
fi
|
2009-04-10 00:34:42 +00:00
|
|
|
parent=$(git rev-parse --verify -q HEAD) ||
|
2011-05-21 18:43:52 +00:00
|
|
|
say >&2 "$(gettext "applying to an empty history")"
|
2009-04-10 00:34:42 +00:00
|
|
|
|
2009-01-23 00:14:58 +00:00
|
|
|
if test -n "$committer_date_is_author_date"
|
|
|
|
then
|
|
|
|
GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
|
|
|
|
export GIT_COMMITTER_DATE
|
|
|
|
fi &&
|
2009-04-19 03:42:07 +00:00
|
|
|
git commit-tree $tree ${parent:+-p} $parent <"$dotest/final-commit"
|
2009-01-23 00:14:58 +00:00
|
|
|
) &&
|
2008-04-15 19:56:50 +00:00
|
|
|
git update-ref -m "$GIT_REFLOG_ACTION: $FIRSTLINE" HEAD $commit $parent ||
|
2005-10-07 10:44:18 +00:00
|
|
|
stop_here $this
|
|
|
|
|
2010-03-12 17:04:29 +00:00
|
|
|
if test -f "$dotest/original-commit"; then
|
|
|
|
echo "$(cat "$dotest/original-commit") $commit" >> "$dotest/rewritten"
|
|
|
|
fi
|
|
|
|
|
2005-10-07 10:44:18 +00:00
|
|
|
if test -x "$GIT_DIR"/hooks/post-applypatch
|
|
|
|
then
|
|
|
|
"$GIT_DIR"/hooks/post-applypatch
|
|
|
|
fi
|
|
|
|
|
|
|
|
go_next
|
|
|
|
done
|
|
|
|
|
2010-03-12 17:04:33 +00:00
|
|
|
if test -s "$dotest"/rewritten; then
|
|
|
|
git notes copy --for-rewrite=rebase < "$dotest"/rewritten
|
|
|
|
if test -x "$GIT_DIR"/hooks/post-rewrite; then
|
2010-03-12 17:04:29 +00:00
|
|
|
"$GIT_DIR"/hooks/post-rewrite rebase < "$dotest"/rewritten
|
2010-03-12 17:04:33 +00:00
|
|
|
fi
|
2010-03-12 17:04:29 +00:00
|
|
|
fi
|
|
|
|
|
2005-10-07 10:44:18 +00:00
|
|
|
rm -fr "$dotest"
|
2010-02-22 14:35:46 +00:00
|
|
|
git gc --auto
|