development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-03 23:29:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

log --pretty/--oneline: ignore log.decorate

Browse source 
Many scripts, most notably gitk, rely on output from the log family of
command not to be molested by random user configuration.  This is
especially true when --pretty=raw is given.

Just like we disable notes output unless the command line explicitly
asks for --show-notes, disable the decoration code unless --decorate is
given explicitly from the command line and --pretty or --oneline is
given.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2010-04-06 14:48:55 -07:00
parent 8a3d203bd0
commit 635530a2fc
2 changed files with 39 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
builtin-log.c
View file

@ -53,6 +53,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
struct rev_info *rev) struct rev_info *rev)
{ {
int i; int i;
int decoration_given = 0;
rev->abbrev = DEFAULT_ABBREV; rev->abbrev = DEFAULT_ABBREV;
rev->commit_format = CMIT_FMT_DEFAULT; rev->commit_format = CMIT_FMT_DEFAULT;
@ -89,11 +90,13 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
const char *arg = argv[i]; const char *arg = argv[i];
if (!strcmp(arg, "--decorate")) { if (!strcmp(arg, "--decorate")) {
decoration_style = DECORATE_SHORT_REFS; decoration_style = DECORATE_SHORT_REFS;
decoration_given = 1;
} else if (!prefixcmp(arg, "--decorate=")) { } else if (!prefixcmp(arg, "--decorate=")) {
const char *v = skip_prefix(arg, "--decorate="); const char *v = skip_prefix(arg, "--decorate=");
decoration_style = parse_decoration_style(arg, v); decoration_style = parse_decoration_style(arg, v);
if (decoration_style < 0) if (decoration_style < 0)
die("invalid --decorate option: %s", arg); die("invalid --decorate option: %s", arg);
decoration_given = 1;
} else if (!strcmp(arg, "--no-decorate")) { } else if (!strcmp(arg, "--no-decorate")) {
decoration_style = 0; decoration_style = 0;
} else if (!strcmp(arg, "--source")) { } else if (!strcmp(arg, "--source")) {
@ -103,6 +106,14 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
} else } else
die("unrecognized argument: %s", arg); die("unrecognized argument: %s", arg);
} }
/*
* defeat log.decorate configuration interacting with --pretty
* from the command line.
*/
if (!decoration_given && rev->pretty_given)
decoration_style = 0;
if (decoration_style) { if (decoration_style) {
rev->show_decorations = 1; rev->show_decorations = 1;
load_ref_decorations(decoration_style); load_ref_decorations(decoration_style);

44
t/t4202-log.sh
View file

@ -390,50 +390,62 @@ test_expect_success 'log --graph with merge' '
test_expect_success 'log.decorate configuration' ' test_expect_success 'log.decorate configuration' '
git config --unset-all log.decorate || : git config --unset-all log.decorate || :
git log --oneline >expect.none && git log >expect.none &&
git log --oneline --decorate >expect.short && git log --decorate >expect.short &&
git log --oneline --decorate=full >expect.full && git log --decorate=full >expect.full &&
git log --oneline >expect.oneline &&
echo "[log] decorate" >>.git/config && echo "[log] decorate" >>.git/config &&
git log --oneline >actual && git log >actual &&
test_cmp expect.short actual && test_cmp expect.short actual &&
git log --oneline >actual &&
test_cmp expect.oneline actual &&
git config --unset-all log.decorate && git config --unset-all log.decorate &&
git config log.decorate true && git config log.decorate true &&
git log --oneline >actual && git log >actual &&
test_cmp expect.short actual && test_cmp expect.short actual &&
git log --oneline --decorate=full >actual && git log --decorate=full >actual &&
test_cmp expect.full actual && test_cmp expect.full actual &&
git log --oneline --decorate=no >actual && git log --decorate=no >actual &&
test_cmp expect.none actual && test_cmp expect.none actual &&
git log --oneline >actual &&
test_cmp expect.oneline actual &&
git config --unset-all log.decorate && git config --unset-all log.decorate &&
git config log.decorate no && git config log.decorate no &&
git log --oneline >actual && git log >actual &&
test_cmp expect.none actual && test_cmp expect.none actual &&
git log --oneline --decorate >actual && git log --decorate >actual &&
test_cmp expect.short actual && test_cmp expect.short actual &&
git log --oneline --decorate=full >actual && git log --decorate=full >actual &&
test_cmp expect.full actual && test_cmp expect.full actual &&
git log --oneline >actual &&
test_cmp expect.oneline actual &&
git config --unset-all log.decorate && git config --unset-all log.decorate &&
git config log.decorate short && git config log.decorate short &&
git log --oneline >actual && git log >actual &&
test_cmp expect.short actual && test_cmp expect.short actual &&
git log --oneline --no-decorate >actual && git log --no-decorate >actual &&
test_cmp expect.none actual && test_cmp expect.none actual &&
git log --oneline --decorate=full >actual && git log --decorate=full >actual &&
test_cmp expect.full actual && test_cmp expect.full actual &&
git log --oneline >actual &&
test_cmp expect.oneline actual &&
git config --unset-all log.decorate && git config --unset-all log.decorate &&
git config log.decorate full && git config log.decorate full &&
git log --oneline >actual && git log >actual &&
test_cmp expect.full actual && test_cmp expect.full actual &&
git log --oneline --no-decorate >actual && git log --no-decorate >actual &&
test_cmp expect.none actual && test_cmp expect.none actual &&
git log --oneline --decorate >actual && git log --decorate >actual &&
test_cmp expect.short actual test_cmp expect.short actual
git log --oneline >actual &&
test_cmp expect.oneline actual &&
:
' '
test_done test_done