summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>2011-12-08 23:30:45 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-09 10:49:43 -0800
commit791970425431878c8abe71645a03f0f64e20e461 (patch)
tree721f6751855443027543a3f6fb4a69a64bcf3b7e
parentmingw: give waitpid the correct signature (diff)
downloadtgif-791970425431878c8abe71645a03f0f64e20e461.tar.xz
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>
-rwxr-xr-xgit-am.sh7
1 files changed, 0 insertions, 7 deletions
diff --git a/git-am.sh b/git-am.sh
index 016b5056eb..94f853fbd4 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -496,7 +496,6 @@ else
echo "$sign" >"$dotest/sign"
echo "$utf8" >"$dotest/utf8"
echo "$keep" >"$dotest/keep"
- echo "$keepcr" >"$dotest/keepcr"
echo "$scissors" >"$dotest/scissors"
echo "$no_inbody_headers" >"$dotest/no_inbody_headers"
echo "$GIT_QUIET" >"$dotest/quiet"
@@ -542,12 +541,6 @@ if test "$(cat "$dotest/keep")" = t
then
keep=-k
fi
-case "$(cat "$dotest/keepcr")" in
-t)
- keepcr=--keep-cr ;;
-f)
- keepcr=--no-keep-cr ;;
-esac
case "$(cat "$dotest/scissors")" in
t)
scissors=--scissors ;;