X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=git-am.sh;h=660b3a4b6113f58ff33fd2db2cdeac25ce32f95d;hb=2c4ed386e8861e730037abe4f4d9e032c5c46242;hp=98a390ab45b044d1cae144456cc3292d8d069852;hpb=0c15cc921a54a2cd5f0758041fe9fdd715a493e8;p=git.git
diff --git a/git-am.sh b/git-am.sh
index 98a390ab..660b3a4b 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -1,10 +1,10 @@
#!/bin/sh
#
#
-. git-sh-setup || die "Not a git archive"
+. git-sh-setup
usage () {
- echo >&2 "usage: $0 [--signoff] [--dotest=
] [--utf8] [--3way] "
+ echo >&2 "usage: $0 [--signoff] [--dotest=] [--utf8] [--binary] [--3way] "
echo >&2 " or, when resuming"
echo >&2 " $0 [--skip | --resolved]"
exit 1;
@@ -40,7 +40,7 @@ fall_back_3way () {
cd "$dotest/patch-merge-tmp-dir" &&
GIT_INDEX_FILE="../patch-merge-tmp-index" \
GIT_OBJECT_DIRECTORY="$O_OBJECT" \
- git-apply --index <../patch
+ git-apply $binary --index <../patch
)
then
echo Using index info to reconstruct a base tree...
@@ -71,7 +71,7 @@ fall_back_3way () {
GIT_OBJECT_DIRECTORY="$O_OBJECT" &&
export GIT_INDEX_FILE GIT_OBJECT_DIRECTORY &&
git-read-tree "$base" &&
- git-apply --index &&
+ git-apply $binary --index &&
mv ../patch-merge-tmp-index ../patch-merge-index &&
echo "$base" >../patch-merge-base
) <"$dotest/patch" 2>/dev/null && break
@@ -98,7 +98,7 @@ fall_back_3way () {
}
prec=4
-dotest=.dotest sign= utf8= keep= skip= interactive= resolved=
+dotest=.dotest sign= utf8= keep= skip= interactive= resolved= binary=
while case "$#" in 0) break;; esac
do
@@ -113,6 +113,9 @@ do
--interacti|--interactiv|--interactive)
interactive=t; shift ;;
+ -b|--b|--bi|--bin|--bina|--binar|--binary)
+ binary=t; shift ;;
+
-3|--3|--3w|--3wa|--3way)
threeway=t; shift ;;
-s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
@@ -169,9 +172,10 @@ else
exit 1
}
- # -s, -u and -k flags are kept for the resuming session after
+ # -b, -s, -u and -k 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"
echo "$sign" >"$dotest/sign"
echo "$utf8" >"$dotest/utf8"
echo "$keep" >"$dotest/keep"
@@ -187,6 +191,10 @@ case "$resolved" in
fi
esac
+if test "$(cat "$dotest/binary")" = t
+then
+ binary=--allow-binary-replacement
+fi
if test "$(cat "$dotest/utf8")" = t
then
utf8=-u
@@ -339,7 +347,7 @@ do
case "$resolved" in
'')
- git-apply --index "$dotest/patch"
+ git-apply $binary --index "$dotest/patch"
apply_status=$?
;;
t)