mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-05 16:52:59 +01:00
Code Activity

Merge branch 'lt/apply' into next

Browse source 
* lt/apply:
  git-am: --whitespace=x option.
This commit is contained in:
Junio C Hamano 2006-03-01 01:35:00 -08:00
commit f64c429ff7
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
git-am.sh
View file

@ -100,7 +100,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 while case "$#" in 0) break;; esac
do do
@ -133,6 +133,9 @@ do
--sk|--ski|--skip) --sk|--ski|--skip)
skip=t; shift ;; skip=t; shift ;;
--whitespace=*)
ws=$1; shift ;;
--) --)
shift; break ;; shift; break ;;
-*) -*)
@ -171,10 +174,11 @@ else
exit 1 exit 1
} }
# -b, -s, -u and -k flags are kept for the resuming session after # -b, -s, -u, -k and --whitespace flags are kept for the
# a patch failure. # resuming session after a patch failure.
# -3 and -i can and must be given when resuming. # -3 and -i can and must be given when resuming.
echo "$binary" >"$dotest/binary" echo "$binary" >"$dotest/binary"
echo " $ws" >"$dotest/whitespace"
echo "$sign" >"$dotest/sign" echo "$sign" >"$dotest/sign"
echo "$utf8" >"$dotest/utf8" echo "$utf8" >"$dotest/utf8"
echo "$keep" >"$dotest/keep" echo "$keep" >"$dotest/keep"
@ -202,6 +206,7 @@ if test "$(cat "$dotest/keep")" = t
then then
keep=-k keep=-k
fi fi
ws=`cat "$dotest/whitespace"`
if test "$(cat "$dotest/sign")" = t if test "$(cat "$dotest/sign")" = t
then then
SIGNOFF=`git-var GIT_COMMITTER_IDENT | sed -e ' SIGNOFF=`git-var GIT_COMMITTER_IDENT | sed -e '
@ -355,7 +360,7 @@ do
case "$resolved" in case "$resolved" in
'') '')
git-apply $binary --index "$dotest/patch" git-apply $binary --index $ws "$dotest/patch"
apply_status=$? apply_status=$?
;; ;;
t) t)