[PATCH] Help scripts that use git-rev-parse to grok args with SP/TAB/LF
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:02
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] Help scripts that use git-rev-parse to grok args with SP/TAB/LF · Junio C Hamano <hidden>
The git-rev-parse command uses LF to separate each arguments it parses, so its users at least need to set IFS to LF to be able to handle filenames with embedded SPs and TABs. Some commands, however, can take and do expect arguments with embedded LF (notably, -Spickaxe of diff family), so even this workaround does not work for them. When --sq flag to git-rev-parse is given, instead of showing one argument per line, it outputs arguments quoted for consumption with "eval" by the caller, to remedy this situation. As an example, this patch converts git-whatchanged to use this feature. Signed-off-by: Junio C Hamano <redacted> --- *** This is a replacement for two patches I sent earlier: *** [RFC/PATCH] git-rev-parse vs IFS *** [PATCH] rev-parse --sq bugfixes. git-whatchanged | 9 ++++++--- rev-parse.c | 34 +++++++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 6 deletions(-) a99f0d64fae9a121a1ecbfd07d7667cf4aa0f19d
diff --git a/git-whatchanged b/git-whatchanged
--- a/git-whatchanged
+++ b/git-whatchanged@@ -1,4 +1,7 @@ #!/bin/sh -git-rev-list $(git-rev-parse --default HEAD --revs-only "$@") | - git-diff-tree --stdin --pretty -r $(git-rev-parse --no-revs "$@") | - LESS="$LESS -S" ${PAGER:-less} +rev_list_args=$(git-rev-parse --sq --default HEAD --revs-only "$@") && +diff_tree_args=$(git-rev-parse --sq --no-revs "$@") && + +eval "git-rev-list $rev_list_args" | +eval "git-diff-tree --stdin --pretty -r $diff_tree_args" | +LESS="$LESS -S" ${PAGER:-less}
diff --git a/rev-parse.c b/rev-parse.c
--- a/rev-parse.c
+++ b/rev-parse.c@@ -15,6 +15,7 @@ static int do_rev_argument = 1; static int output_revs = 0; static int flags_only = 0; static int no_flags = 0; +static int output_sq = 0; #define NORMAL 0 #define REVERSED 1
@@ -49,19 +50,42 @@ static int is_rev_argument(const char *a } } +static void show(const char *arg) +{ + if (output_sq) { + int sq = '\'', ch; + + putchar(sq); + while ((ch = *arg++)) { + if (ch == sq) + fputs("'\\'", stdout); + putchar(ch); + } + putchar(sq); + putchar(' '); + } + else + puts(arg); +} + static void show_rev(int type, const unsigned char *sha1) { if (no_revs) return; output_revs++; - printf("%s%s\n", type == show_type ? "" : "^", sha1_to_hex(sha1)); + + /* Hexadecimal string plus possibly a carret; + * this does not have to be quoted even under output_sq. + */ + printf("%s%s%c", type == show_type ? "" : "^", sha1_to_hex(sha1), + output_sq ? ' ' : '\n'); } static void show_rev_arg(char *rev) { if (no_revs) return; - puts(rev); + show(rev); } static void show_norev(char *norev)
@@ -70,7 +94,7 @@ static void show_norev(char *norev) return; if (revs_only) return; - puts(norev); + show(norev); } static void show_arg(char *arg)
@@ -328,6 +352,10 @@ int main(int argc, char **argv) single_rev = 1; continue; } + if (!strcmp(arg, "--sq")) { + output_sq = 1; + continue; + } if (!strcmp(arg, "--not")) { show_type ^= REVERSED; continue;