summaryrefslogtreecommitdiff
path: root/contrib/completion
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2021-04-07 10:50:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-04-07 22:14:51 (GMT)
commit3994ae510ea8f828a1175392e85d387fe0e77682 (patch)
treec31b5078444e723793807da9de9a594acc0a2410 /contrib/completion
parent2e36527f23b7f6ae15e6f21ac3b08bf3fed6ee48 (diff)
downloadgit-3994ae510ea8f828a1175392e85d387fe0e77682.zip
git-3994ae510ea8f828a1175392e85d387fe0e77682.tar.gz
git-3994ae510ea8f828a1175392e85d387fe0e77682.tar.bz2
bash completion: complete CHERRY_PICK_HEAD
When e.g. in a failed cherry pick we did not recognize CHERRY_PICK_HEAD as we do e.g. REBASE_HEAD in a failed rebase let's rectify that. When REBASE_HEAD was added in fbd7a232370 (rebase: introduce and use pseudo-ref REBASE_HEAD, 2018-02-11) a completion was added for it, but no corresponding completion existed for CHERRY_PICK_HEAD added in d7e5c0cbfb0 (Introduce CHERRY_PICK_HEAD, 2011-02-19). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/completion')
-rw-r--r--contrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e1a6695..dbb2909 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -744,7 +744,7 @@ __git_refs ()
track=""
;;
*)
- for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD; do
+ for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD CHERRY_PICK_HEAD; do
case "$i" in
$match*)
if [ -e "$dir/$i" ]; then