From: "Martin Bektchiev via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Martin Bektchiev <martinb@gmail.com>,
Martin Bektchiev <martin.bektchiev@progress.com>
Subject: [PATCH] commit: correctly escape @ of stashes
Date: Fri, 03 Jul 2020 09:30:55 +0000 [thread overview]
Message-ID: <pull.815.git.git.1593768655179.gitgitgadget@gmail.com> (raw)
From: Martin Bektchiev <martin.bektchiev@progress.com>
Autocomplete suggestions for stashes are broken due to `stash@`
being suggested without escaping.
Reproducible on `GNU bash, version 3.2.57(1)-release` and
`macOS Catalina 10.15.5`.
Signed-off-by: Martin Bektchiev <martin.bektchiev@progress.com>
---
Correctly escape @ of stashes
Autocomplete suggestions for stashes are broken due to stash@being
suggested without escaping.
Reproducible on GNU bash, version 3.2.57(1)-release
(x86_64-apple-darwin19)and macOS Catalina 10.15.5.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-815%2Fmbektchiev%2Fpatch-1-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-815/mbektchiev/patch-1-v1
Pull-Request: https://github.com/git/git/pull/815
contrib/completion/git-completion.bash | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index de5d0fbbd1..986a7352ef 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2999,12 +2999,14 @@ _git_stash ()
__git_complete_refs
else
__gitcomp_nl "$(__git stash list \
- | sed -n -e 's/:.*//p')"
+ | sed -n -e 's/:.*//p' \
+ | sed 's/@/\\@/')"
fi
;;
show,*|apply,*|drop,*|pop,*)
__gitcomp_nl "$(__git stash list \
- | sed -n -e 's/:.*//p')"
+ | sed -n -e 's/:.*//p' \
+ | sed 's/@/\\@/')"
;;
*)
;;
base-commit: a08a83db2bf27f015bec9a435f6d73e223c21c5e
--
gitgitgadget
next reply other threads:[~2020-07-03 9:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-03 9:30 Martin Bektchiev via GitGitGadget [this message]
2020-07-06 6:39 ` [PATCH] commit: correctly escape @ of stashes Junio C Hamano
2020-07-06 23:14 ` Johannes Schindelin
2020-07-08 20:53 ` Junio C Hamano
[not found] ` <CAEVR=HRrtT-vae8edN=Ltnp=amApMfUrt0j+6guWYMWZyz8Ohw@mail.gmail.com>
2020-07-09 9:13 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.815.git.git.1593768655179.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=martin.bektchiev@progress.com \
--cc=martinb@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).