{"thread":{"id":"6707","subject":"[PATCH 1/2] bash: Support git-rebase -m continuation completion.","startedAt":"2007-02-06T02:37:54Z","lastAt":"2007-02-06T02:37:54Z","messageCount":1,"participants":["Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"33684","messageId":"20070206023754.GA9922@spearce.org","threadId":"6707","inReplyTo":null,"subject":"[PATCH 1/2] bash: Support git-rebase -m continuation completion.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-02-06T02:37:54Z","receivedAt":"2007-02-06T02:37:54Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Apparently `git-rebase -m` uses a metadata directory within .git\n(.git/.dotest-merge) rather than .dotest used by git-am (and\ngit-rebase without the -m option).  This caused the completion code\nto not offer --continue, --skip or --abort when working within a\n`git-rebase -m` session.\n\nSigned-off-by: Shawn O. Pearce <spearce@spearce.org>\n---\n\n This is a resend.  You skipped this series of 2 patches.\n\n contrib/completion/git-completion.bash |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 430e636..b0ff87d 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -675,7 +675,7 @@ _git_push ()\n _git_rebase ()\n {\n \tlocal cur=\"${COMP_WORDS[COMP_CWORD]}\"\n-\tif [ -d .dotest ]; then\n+\tif [ -d .dotest ] || [ -d .git/.dotest-merge ]; then\n \t\t__gitcomp \"--continue --skip --abort\"\n \t\treturn\n \tfi\n-- \n1.5.0.rc3.58.g79812\n"}]}