Martin von Zweigbergk  committed 7919704

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 <>

  • Participants
  • Parent commits 956d86d
  • Branches master

Comments (0)

Files changed (1)

 	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"
-case "$(cat "$dotest/keepcr")" in
-	keepcr=--keep-cr ;;
-	keepcr=--no-keep-cr ;;
 case "$(cat "$dotest/scissors")" in
 	scissors=--scissors ;;