From: "Rubén Justo" <rjusto@gmail.com>
To: Git List <git@vger.kernel.org>
Subject: [PATCH] completion: fix __git_complete_worktree_paths
Date: Sun, 25 Feb 2024 09:16:15 +0100 [thread overview]
Message-ID: <a1561e02-40dc-4ac3-ae7a-666db0f810ed@gmail.com> (raw)
Use __git to invoke "worktree list" in __git_complete_worktree_paths, to
respect any "-C" and "--git-dir" options present on the command line.
Signed-off-by: Rubén Justo <rjusto@gmail.com>
---
I stumbled upon this in a situation like:
$ git init /tmp/foo && cd /tmp/foo
$ git worktree add --orphan foo_wt
$ git init /tmp/bar && cd /tmp/bar
$ git worktree add --orphan bar_wt
$ cd /tmp/foo
$ git -C /tmp/bar worktree remove <TAB>
... expecting /tmp/bar/wt, but ...
$ git -C /tmp/bar worktree remove /tmp/foo_wt
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 444b3efa63..86e55dc67f 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -3571,7 +3571,7 @@ __git_complete_worktree_paths ()
# Generate completion reply from worktree list skipping the first
# entry: it's the path of the main worktree, which can't be moved,
# removed, locked, etc.
- __gitcomp_nl "$(git worktree list --porcelain |
+ __gitcomp_nl "$(__git worktree list --porcelain |
sed -n -e '2,$ s/^worktree //p')"
}
--
2.44.0
next reply other threads:[~2024-02-25 8:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-25 8:16 Rubén Justo [this message]
2024-02-25 23:53 ` [PATCH v2] completion: fix __git_complete_worktree_paths Rubén Justo
2024-02-27 8:21 ` Patrick Steinhardt
2024-02-27 18:09 ` Rubén Justo
2024-02-27 21:06 ` [PATCH v3] " Rubén Justo
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=a1561e02-40dc-4ac3-ae7a-666db0f810ed@gmail.com \
--to=rjusto@gmail.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.