diff options
author | Junio C Hamano <junkio@cox.net> | 2006-03-02 01:06:12 (GMT) |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-03-02 01:06:12 (GMT) |
commit | e1a0c8b1483b38d32d3870408e03a6c1b340aa15 (patch) | |
tree | 7b803af235c934438e1133095c0ade9f4843db27 /git-am.sh | |
parent | 9e7c73de0bcd410d12f897b19419dd35accd961e (diff) | |
parent | 12cbbdc40b50458b29b76af740ddc0ab1979b322 (diff) | |
download | git-1.2.4.zip git-1.2.4.tar.gz git-1.2.4.tar.bz2 |
Merge branch 'lt/fix-apply' into maintv1.2.4
* lt/fix-apply:
git-am: --whitespace=x option.
git-apply: war on whitespace -- finishing touches.
git-apply --whitespace=nowarn
apply --whitespace: configuration option.
apply: squelch excessive errors and --whitespace=error-all
apply --whitespace fixes and enhancements.
The war on trailing whitespace
Diffstat (limited to 'git-am.sh')
-rwxr-xr-x | git-am.sh | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -100,7 +100,7 @@ fall_back_3way () { } 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 @@ -133,6 +133,9 @@ do --sk|--ski|--skip) skip=t; shift ;; + --whitespace=*) + ws=$1; shift ;; + --) shift; break ;; -*) @@ -171,10 +174,11 @@ else 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" + echo " $ws" >"$dotest/whitespace" echo "$sign" >"$dotest/sign" echo "$utf8" >"$dotest/utf8" echo "$keep" >"$dotest/keep" @@ -202,6 +206,7 @@ if test "$(cat "$dotest/keep")" = t then keep=-k fi +ws=`cat "$dotest/whitespace"` if test "$(cat "$dotest/sign")" = t then SIGNOFF=`git-var GIT_COMMITTER_IDENT | sed -e ' @@ -355,7 +360,7 @@ do case "$resolved" in '') - git-apply $binary --index "$dotest/patch" + git-apply $binary --index $ws "$dotest/patch" apply_status=$? ;; t) |