From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH] merge: support --strategy '?' for git-completion.bash
Date: Thu, 25 Jan 2018 16:40:31 +0700 [thread overview]
Message-ID: <20180125094031.6584-1-pclouds@gmail.com> (raw)
Bash completion support gets the list of available strategies with a
grep and sed trick which does not work on non-C locale since the anchor
string is translated and it does not cover custom strategies either.
Let's do it a better way and make git-merge provide all available
strategies in machine-readable form.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
Another, perhaps better, option is add "git merge --list-strategies".
It requires some code movement, so I'll try with a simpler approach
first.
Documentation/merge-options.txt | 3 +++
builtin/merge.c | 7 +++++++
contrib/completion/git-completion.bash | 9 +--------
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 3888c3ff85..cd4342844f 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -97,6 +97,9 @@ option can be used to override --squash.
If there is no `-s` option, a built-in list of strategies
is used instead ('git merge-recursive' when merging a single
head, 'git merge-octopus' otherwise).
++
+The special strategy '?' lists all available strategies and exits
+immediately. No merge operation is done.
-X <option>::
--strategy-option=<option>::
diff --git a/builtin/merge.c b/builtin/merge.c
index 30264cfd7c..a09d04302c 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -140,6 +140,13 @@ static struct strategy *get_strategy(const char *name)
}
exclude_cmds(&main_cmds, ¬_strategies);
}
+ if (!strcmp(name, "?")) {
+ for (i = 0; i < main_cmds.cnt; i++)
+ puts(main_cmds.names[i]->name);
+ for (i = 0; i < other_cmds.cnt; i++)
+ puts(other_cmds.names[i]->name);
+ exit(0);
+ }
if (!is_in_cmdlist(&main_cmds, name) && !is_in_cmdlist(&other_cmds, name)) {
fprintf(stderr, _("Could not find merge strategy '%s'.\n"), name);
fprintf(stderr, _("Available strategies are:"));
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 3683c772c5..6d947be858 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -594,14 +594,7 @@ __git_is_configured_remote ()
__git_list_merge_strategies ()
{
- git merge -s help 2>&1 |
- sed -n -e '/[Aa]vailable strategies are: /,/^$/{
- s/\.$//
- s/.*://
- s/^[ ]*//
- s/[ ]*$//
- p
- }'
+ git merge --strategy '?'
}
__git_merge_strategies=
--
2.16.0.47.g3d9b0fac3a
next reply other threads:[~2018-01-25 9:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-25 9:40 Nguyễn Thái Ngọc Duy [this message]
2018-01-25 18:49 ` [PATCH] merge: support --strategy '?' for git-completion.bash Junio C Hamano
2018-01-26 1:31 ` Duy Nguyen
2018-01-26 17:47 ` Junio C Hamano
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=20180125094031.6584-1-pclouds@gmail.com \
--to=pclouds@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 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).