summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorEli Collins <eli@cloudera.com>2010-05-03 02:03:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-05-19 04:31:51 (GMT)
commitf89504ddb9392fa6b9407957bf26905fd1d59d0a (patch)
tree970b0f13668f26c4ec3fd694b438fab6ae2cb41d /diff.c
parent0e4607c09d72ada4942ea49298dba83ec4145892 (diff)
downloadgit-f89504ddb9392fa6b9407957bf26905fd1d59d0a.zip
git-f89504ddb9392fa6b9407957bf26905fd1d59d0a.tar.gz
git-f89504ddb9392fa6b9407957bf26905fd1d59d0a.tar.bz2
diff: add configuration option for disabling diff prefixes.
With new configuration "diff.noprefix", "git diff" does not show a source or destination prefix ala "git diff --no-prefix". Signed-off-by: Eli Collins <eli@cloudera.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index e49f14a..6d9928c 100644
--- a/diff.c
+++ b/diff.c
@@ -30,6 +30,7 @@ static const char *diff_word_regex_cfg;
static const char *external_diff_cmd_cfg;
int diff_auto_refresh_index = 1;
static int diff_mnemonic_prefix;
+static int diff_no_prefix;
static char diff_colors[][COLOR_MAXLEN] = {
GIT_COLOR_RESET,
@@ -101,6 +102,10 @@ int git_diff_ui_config(const char *var, const char *value, void *cb)
diff_mnemonic_prefix = git_config_bool(var, value);
return 0;
}
+ if (!strcmp(var, "diff.noprefix")) {
+ diff_no_prefix = git_config_bool(var, value);
+ return 0;
+ }
if (!strcmp(var, "diff.external"))
return git_config_string(&external_diff_cmd_cfg, var, value);
if (!strcmp(var, "diff.wordregex"))
@@ -2538,7 +2543,9 @@ void diff_setup(struct diff_options *options)
DIFF_OPT_SET(options, COLOR_DIFF);
options->detect_rename = diff_detect_rename_default;
- if (!diff_mnemonic_prefix) {
+ if (diff_no_prefix) {
+ options->a_prefix = options->b_prefix = "";
+ } else if (!diff_mnemonic_prefix) {
options->a_prefix = "a/";
options->b_prefix = "b/";
}