global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 02:13:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sd/log-decorate' into next

Browse Source 
* sd/log-decorate:
  log --pretty/--oneline: ignore log.decorate
This commit is contained in:
Junio C Hamano
2010-04-06 15:00:39 -07:00
parent 1b8066f52e 635530a2fc
commit 992c9add13
2 changed files with 39 additions and 16 deletions
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 setup_revision_opt *opt)
{
int i;
int decoration_given = 0;
rev->abbrev = DEFAULT_ABBREV;
rev->commit_format = CMIT_FMT_DEFAULT;
@@ -91,11 +92,13 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
const char *arg = argv[i];
if (!strcmp(arg, "--decorate")) {
decoration_style = DECORATE_SHORT_REFS;
decoration_given = 1;
} else if (!prefixcmp(arg, "--decorate=")) {
const char *v = skip_prefix(arg, "--decorate=");
decoration_style = parse_decoration_style(arg, v);
if (decoration_style < 0)
die("invalid --decorate option: %s", arg);
decoration_given = 1;
} else if (!strcmp(arg, "--no-decorate")) {
decoration_style = 0;
} else if (!strcmp(arg, "--source")) {
@@ -105,6 +108,14 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
} else
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) {
rev->show_decorations = 1;
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' '
git config --unset-all log.decorate || :
git log --oneline >expect.none &&
git log --oneline --decorate >expect.short &&
git log --oneline --decorate=full >expect.full &&
git log >expect.none &&
git log --decorate >expect.short &&
git log --decorate=full >expect.full &&
git log --oneline >expect.oneline &&
echo "[log] decorate" >>.git/config &&
git log --oneline >actual &&
git log >actual &&
test_cmp expect.short actual &&
git log --oneline >actual &&
test_cmp expect.oneline actual &&
git config --unset-all log.decorate &&
git config log.decorate true &&
git log --oneline >actual &&
git log >actual &&
test_cmp expect.short actual &&
git log --oneline --decorate=full >actual &&
git log --decorate=full >actual &&
test_cmp expect.full actual &&
git log --oneline --decorate=no >actual &&
git log --decorate=no >actual &&
test_cmp expect.none actual &&
git log --oneline >actual &&
test_cmp expect.oneline actual &&
git config --unset-all log.decorate &&
git config log.decorate no &&
git log --oneline >actual &&
git log >actual &&
test_cmp expect.none actual &&
git log --oneline --decorate >actual &&
git log --decorate >actual &&
test_cmp expect.short actual &&
git log --oneline --decorate=full >actual &&
git log --decorate=full >actual &&
test_cmp expect.full actual &&
git log --oneline >actual &&
test_cmp expect.oneline actual &&
git config --unset-all log.decorate &&
git config log.decorate short &&
git log --oneline >actual &&
git log >actual &&
test_cmp expect.short actual &&
git log --oneline --no-decorate >actual &&
git log --no-decorate >actual &&
test_cmp expect.none actual &&
git log --oneline --decorate=full >actual &&
git log --decorate=full >actual &&
test_cmp expect.full actual &&
git log --oneline >actual &&
test_cmp expect.oneline actual &&
git config --unset-all log.decorate &&
git config log.decorate full &&
git log --oneline >actual &&
git log >actual &&
test_cmp expect.full actual &&
git log --oneline --no-decorate >actual &&
git log --no-decorate >actual &&
test_cmp expect.none actual &&
git log --oneline --decorate >actual &&
git log --decorate >actual &&
test_cmp expect.short actual
git log --oneline >actual &&
test_cmp expect.oneline actual &&
:
'
test_done