From 791970425431878c8abe71645a03f0f64e20e461 Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Thu, 8 Dec 2011 23:30:45 -0800 Subject: 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 Signed-off-by: Junio C Hamano --- git-am.sh | 7 ------- 1 file changed, 7 deletions(-) (limited to 'git-am.sh') diff --git a/git-am.sh b/git-am.sh index 016b5056e..94f853fbd 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 ;; -- cgit v1.2.1