projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tar-tree: Remove obsolete code
[git.git]
/
git-am.sh
diff --git
a/git-am.sh
b/git-am.sh
index
7cc4ae5
..
eab4aa8
100755
(executable)
--- a/
git-am.sh
+++ b/
git-am.sh
@@
-2,7
+2,8
@@
#
# Copyright (c) 2005, 2006 Junio C Hamano
#
# Copyright (c) 2005, 2006 Junio C Hamano
-USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>
+USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]
+ [--interactive] [--whitespace=<option>] <mbox>...
or, when resuming [--skip | --resolved]'
. git-sh-setup
or, when resuming [--skip | --resolved]'
. git-sh-setup
@@
-100,7
+101,7
@@
fall_back_3way () {
}
prec=4
}
prec=4
-dotest=.dotest sign= utf8= keep= skip= interactive= resolved= binary=
+dotest=.dotest sign= utf8= keep= skip= interactive= resolved= binary=
ws=
while case "$#" in 0) break;; esac
do
while case "$#" in 0) break;; esac
do
@@
-133,6
+134,9
@@
do
--sk|--ski|--skip)
skip=t; shift ;;
--sk|--ski|--skip)
skip=t; shift ;;
+ --whitespace=*)
+ ws=$1; shift ;;
+
--)
shift; break ;;
-*)
--)
shift; break ;;
-*)
@@
-171,10
+175,11
@@
else
exit 1
}
exit 1
}
- # -b, -s, -u
and -k flags are kept for the resuming session after
- # a patch failure.
+ # -b, -s, -u
, -k and --whitespace flags are kept for the
+ #
resuming session after
a patch failure.
# -3 and -i can and must be given when resuming.
echo "$binary" >"$dotest/binary"
# -3 and -i can and must be given when resuming.
echo "$binary" >"$dotest/binary"
+ echo " $ws" >"$dotest/whitespace"
echo "$sign" >"$dotest/sign"
echo "$utf8" >"$dotest/utf8"
echo "$keep" >"$dotest/keep"
echo "$sign" >"$dotest/sign"
echo "$utf8" >"$dotest/utf8"
echo "$keep" >"$dotest/keep"
@@
-202,6
+207,7
@@
if test "$(cat "$dotest/keep")" = t
then
keep=-k
fi
then
keep=-k
fi
+ws=`cat "$dotest/whitespace"`
if test "$(cat "$dotest/sign")" = t
then
SIGNOFF=`git-var GIT_COMMITTER_IDENT | sed -e '
if test "$(cat "$dotest/sign")" = t
then
SIGNOFF=`git-var GIT_COMMITTER_IDENT | sed -e '
@@
-355,7
+361,7
@@
do
case "$resolved" in
'')
case "$resolved" in
'')
- git-apply $binary --index "$dotest/patch"
+ git-apply $binary --index
$ws
"$dotest/patch"
apply_status=$?
;;
t)
apply_status=$?
;;
t)