am: don't persist keepcr flag
The keepcr flag is only used in the split_patches function, which is only called before a patch application has to stopped for user input, not after resuming. It is therefore unnecessary to persist the flag. This seems to have been the case since it was introduced in ad2c928 (git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit, 2010-02-27). Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Martin von Zweigbergk committed
Dec 8, 2011 at 23:30 UTC
791970425431878c8abe71645a03f0f64e20e461
1 file changed
-7
git-am.sh
-7
@@ -496,7 +496,6 @@ else
496
echo "$sign" >"$dotest/sign"
497
echo "$utf8" >"$dotest/utf8"
498
echo "$keep" >"$dotest/keep"
499
- echo "$keepcr" >"$dotest/keepcr"
499
echo "$scissors" >"$dotest/scissors"
500
echo "$no_inbody_headers" >"$dotest/no_inbody_headers"
501
echo "$GIT_QUIET" >"$dotest/quiet"
@@ -542,12 +541,6 @@ if test "$(cat "$dotest/keep")" = t
541
then
542
keep=-k
543
fi
545
-case "$(cat "$dotest/keepcr")" in
546
-t)
547
- keepcr=--keep-cr ;;
548
-f)
549
- keepcr=--no-keep-cr ;;
550
-esac
544
case "$(cat "$dotest/scissors")" in
545
t)
546
scissors=--scissors ;;