Skip to content

Commit

Permalink
am: don't persist keepcr flag
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Martin von Zweigbergk authored and Junio C Hamano committed Dec 9, 2011
1 parent 956d86d commit 7919704
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions git-am.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 ;;
Expand Down

0 comments on commit 7919704

Please sign in to comment.