[PATCH] am: don't persist keepcr flag
- From
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
- Date
- Dec 9, 2011, 07:30 UTC
- Message-ID
- <1323415845-11826-1-git-send-email-martin.von.zweigbergk@gmail.com>
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> --- git-am.sh | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/git-am.sh b/git-am.sh index 9042432..1c13b13 100755 --- a/git-am.sh +++ b/git-am.sh @@ -530,7 +530,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" @@ -576,12 +575,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 ;;
-- 1.7.8.237.gcc4e3