Skip to content

Commit 7919704

Browse files
Martin von Zweigbergkgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 956d86d commit 7919704

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

git-am.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,6 @@ else
496496
echo "$sign" >"$dotest/sign"
497497
echo "$utf8" >"$dotest/utf8"
498498
echo "$keep" >"$dotest/keep"
499-
echo "$keepcr" >"$dotest/keepcr"
500499
echo "$scissors" >"$dotest/scissors"
501500
echo "$no_inbody_headers" >"$dotest/no_inbody_headers"
502501
echo "$GIT_QUIET" >"$dotest/quiet"
@@ -542,12 +541,6 @@ if test "$(cat "$dotest/keep")" = t
542541
then
543542
keep=-k
544543
fi
545-
case "$(cat "$dotest/keepcr")" in
546-
t)
547-
keepcr=--keep-cr ;;
548-
f)
549-
keepcr=--no-keep-cr ;;
550-
esac
551544
case "$(cat "$dotest/scissors")" in
552545
t)
553546
scissors=--scissors ;;

0 commit comments

Comments
 (0)