{"thread":{"id":"33594","subject":"[PATCH] completion: remove duplicate block for \"git commit -c\"","startedAt":"2013-04-24T20:49:06Z","lastAt":"2013-04-24T23:04:50Z","messageCount":2,"participants":["Mårten Kongstad","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"215380","messageId":"1366836546-11081-1-git-send-email-marten.kongstad@gmail.com","threadId":"33594","inReplyTo":null,"subject":"[PATCH] completion: remove duplicate block for \"git commit -c\"","fromName":"Mårten Kongstad","fromEmail":"marten.kongstad@gmail.com","sentAt":"2013-04-24T20:49:06Z","receivedAt":"2013-04-24T20:49:06Z","isPatch":true,"sender":{"key":"marten.kongstad@gmail.com","avatar":"https://avatars.githubusercontent.com/u/567558?v=4"},"body":"Remove one of two consecutive, identical blocks for \"git commit -c\".\n\nSigned-off-by: Mårten Kongstad <marten.kongstad@gmail.com>\n---\n contrib/completion/git-completion.bash |    7 -------\n 1 file changed, 7 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 93eba46..f67b0f0 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1182,13 +1182,6 @@ _git_commit ()\n \t\t;;\n \tesac\n \n-\tcase \"$prev\" in\n-\t-c|-C)\n-\t\t__gitcomp_nl \"$(__git_refs)\" \"\" \"${cur}\"\n-\t\treturn\n-\t\t;;\n-\tesac\n-\n \tcase \"$cur\" in\n \t--cleanup=*)\n \t\t__gitcomp \"default strip verbatim whitespace\n-- \n1.7.9.5\n"},{"id":"215397","messageId":"7vvc7b8r8t.fsf@alter.siamese.dyndns.org","threadId":"33594","inReplyTo":"1366836546-11081-1-git-send-email-marten.kongstad@gmail.com","subject":"Re: [PATCH] completion: remove duplicate block for \"git commit -c\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-24T23:04:50Z","receivedAt":"2013-04-24T23:04:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"This was caused by a mechanical mismerge at d931e2fb252e (Merge\nbranch 'mp/complete-paths', 2013-02-08), it seems.  The side branch\nfea16b47 wanted to add this block, of course, but the same fix was\ndone independently in 685397585 already.\n\nThanks for catching it.\n"}]}