* [PATCH] completion: remove duplicate block for "git commit -c"
@ 2013-04-24 20:49 Mårten Kongstad
2013-04-24 23:04 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Mårten Kongstad @ 2013-04-24 20:49 UTC (permalink / raw)
To: git; +Cc: gitster, felipe.contreras, peff, manlio.perillo,
Mårten Kongstad
Remove one of two consecutive, identical blocks for "git commit -c".
Signed-off-by: Mårten Kongstad <marten.kongstad@gmail.com>
---
contrib/completion/git-completion.bash | 7 -------
1 file changed, 7 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 93eba46..f67b0f0 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1182,13 +1182,6 @@ _git_commit ()
;;
esac
- case "$prev" in
- -c|-C)
- __gitcomp_nl "$(__git_refs)" "" "${cur}"
- return
- ;;
- esac
-
case "$cur" in
--cleanup=*)
__gitcomp "default strip verbatim whitespace
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] completion: remove duplicate block for "git commit -c"
2013-04-24 20:49 [PATCH] completion: remove duplicate block for "git commit -c" Mårten Kongstad
@ 2013-04-24 23:04 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2013-04-24 23:04 UTC (permalink / raw)
To: Mårten Kongstad; +Cc: git, felipe.contreras, peff, manlio.perillo
This was caused by a mechanical mismerge at d931e2fb252e (Merge
branch 'mp/complete-paths', 2013-02-08), it seems. The side branch
fea16b47 wanted to add this block, of course, but the same fix was
done independently in 685397585 already.
Thanks for catching it.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-24 23:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-24 20:49 [PATCH] completion: remove duplicate block for "git commit -c" Mårten Kongstad
2013-04-24 23:04 ` Junio C Hamano
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).