{"thread":{"id":"55443","subject":"[PATCH] bash completion: complete CHERRY_PICK_HEAD","startedAt":"2021-04-07T10:51:03Z","lastAt":"2021-04-07T22:21:13Z","messageCount":2,"participants":["Ævar Arnfjörð Bjarmason","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"421115","messageId":"patch-1.1-483669af7fc-20210407T105035Z-avarab@gmail.com","threadId":"55443","inReplyTo":null,"subject":"[PATCH] bash completion: complete CHERRY_PICK_HEAD","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2021-04-07T10:50:51Z","receivedAt":"2021-04-07T10:51:03Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"When e.g. in a failed cherry pick we did not recognize\nCHERRY_PICK_HEAD as we do e.g. REBASE_HEAD in a failed rebase let's\nrectify that.\n\nWhen REBASE_HEAD was added in fbd7a232370 (rebase: introduce and use\npseudo-ref REBASE_HEAD, 2018-02-11) a completion was added for it, but\nno corresponding completion existed for CHERRY_PICK_HEAD added in\nd7e5c0cbfb0 (Introduce CHERRY_PICK_HEAD, 2011-02-19).\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex e1a66954fe8..dbb290956b6 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -744,7 +744,7 @@ __git_refs ()\n \t\t\ttrack=\"\"\n \t\t\t;;\n \t\t*)\n-\t\t\tfor i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD; do\n+\t\t\tfor i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD CHERRY_PICK_HEAD; do\n \t\t\t\tcase \"$i\" in\n \t\t\t\t$match*)\n \t\t\t\t\tif [ -e \"$dir/$i\" ]; then\n-- \n2.31.1.527.g9b8f7de2547\n\n"},{"id":"421164","messageId":"xmqq35w1ybvu.fsf@gitster.g","threadId":"55443","inReplyTo":"patch-1.1-483669af7fc-20210407T105035Z-avarab@gmail.com","subject":"Re: [PATCH] bash completion: complete CHERRY_PICK_HEAD","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-04-07T22:21:09Z","receivedAt":"2021-04-07T22:21:13Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:\n\n> -\t\t\tfor i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD; do\n> +\t\t\tfor i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD CHERRY_PICK_HEAD; do\n>  \t\t\t\tcase \"$i\" in\n>  \t\t\t\t$match*)\n>  \t\t\t\t\tif [ -e \"$dir/$i\" ]; then\n>\t\t\t\t\t\techo \"$pfx$i$sfx\"\n>\t\t\t\t\tfi\n>\t\t\t\t\t;;\n\nHmph, it gets tempting to do this instead:\n\n\tfor i in $(cd \"$dir/\" && echo HEAD *_HEAD)\n\tdo\n\t\tcase \"$i\" in\n\t\t$match*)\n\t\t\techo \"$pfx$i$sfx\"\n\t\t\t;;\n\t\tesac\n\tdone\n\nbut I am no completion expert, so I'll queue the patch as-is.\n\nThanks.\n"}]}