git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ted Pavlic <ted@tedpavlic.com>
To: gitster@pobox.com, kha@treskal.com
Cc: git@vger.kernel.org, catalin.marinas@gmail.com,
	Ted Pavlic <ted@tedpavlic.com>
Subject: [kha/safe PATCH] completion bugfix: Place double pipes in front of alternate command.
Date: Thu, 22 Jan 2009 19:26:12 -0500	[thread overview]
Message-ID: <1232670372-20000-1-git-send-email-ted@tedpavlic.com> (raw)
In-Reply-To: <20090122232928.GA23456@diana.vm.bytemark.co.uk>

Signed-off-by: Ted Pavlic <ted@tedpavlic.com>
---

This is a patch against 

    git://repo.or.cz/stgit/kha.git stable

Unfortunately, the previous "[StGit PATCH 2/2]" had a small bug in it. A
bugfix was posted, but it didn't get picked up in kha/safe. This commit
should be applied against kha/safe to fix the problem.

Alternatively, the patch provided in

    <1232642662-12851-1-git-send-email-ted@tedpavlic.com>

is the proper patch to stgit/master.

Sorry for the extra bother.

 stgit/completion.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/stgit/completion.py b/stgit/completion.py
index 56e81c2..38f0670 100644
--- a/stgit/completion.py
+++ b/stgit/completion.py
@@ -130,7 +130,7 @@ def main_switch(commands):
 
 def install():
     return ['complete -o bashdefault -o default -F _stg stg 2>/dev/null \\', [
-            'complete -o default -F _stg stg' ] ]
+            '|| complete -o default -F _stg stg' ] ]
 
 def write_completion(f):
     commands = stgit.commands.get_commands(allow_cached = False)
-- 
1.6.1.213.g28da8

  reply	other threads:[~2009-01-23  0:27 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-20  0:46 [StGit PATCH 1/2] Modify bash completion to support help, version, and copyright ted
2009-01-20  0:46 ` [StGit PATCH 2/2] Make bash completion fail to bashdefault before default completion ted
2009-01-22 16:38   ` Ted Pavlic
2009-01-22 16:44     ` Ted Pavlic
2009-01-22 23:29   ` kha/{stable,safe,experimental} updated Karl Hasselström
2009-01-23  0:26     ` Ted Pavlic [this message]
2009-01-23  1:35       ` [kha/safe PATCH] completion bugfix: Place double pipes in front of alternate command Karl Hasselström

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1232670372-20000-1-git-send-email-ted@tedpavlic.com \
    --to=ted@tedpavlic.com \
    --cc=catalin.marinas@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=kha@treskal.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).