summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorĐoàn Trần Công Danh <congdanhqx@gmail.com>2021-05-09 17:12:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-05-10 06:06:22 (GMT)
commit59b519ab7e703ebdbad06bd9ba3cae6e55d880d0 (patch)
treea3d3aa43c7cbc681c60dd9d8a5df4a404b7266c3 /contrib
parent133a4fda59e7e68be13191082e14be32143bd61b (diff)
downloadgit-59b519ab7e703ebdbad06bd9ba3cae6e55d880d0.zip
git-59b519ab7e703ebdbad06bd9ba3cae6e55d880d0.tar.gz
git-59b519ab7e703ebdbad06bd9ba3cae6e55d880d0.tar.bz2
am: learn to process quoted lines that ends with CRLF
In previous changes, mailinfo has learnt to process lines that decoded from base64 or quoted-printable, and ends with CRLF. Let's teach "am" that new trick, too. Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash5
1 files changed, 5 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 49e76e9..edf6350 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1333,6 +1333,7 @@ __git_whitespacelist="nowarn warn error error-all fix"
__git_patchformat="mbox stgit stgit-series hg mboxrd"
__git_showcurrentpatch="diff raw"
__git_am_inprogress_options="--skip --continue --resolved --abort --quit --show-current-patch"
+__git_quoted_cr="nowarn warn strip"
_git_am ()
{
@@ -1354,6 +1355,10 @@ _git_am ()
__gitcomp "$__git_showcurrentpatch" "" "${cur##--show-current-patch=}"
return
;;
+ --quoted-cr=*)
+ __gitcomp "$__git_quoted_cr" "" "${cur##--quoted-cr=}"
+ return
+ ;;
--*)
__gitcomp_builtin am "" \
"$__git_am_inprogress_options"