added support for `git diff --no-relative` (code, documentation, and tests)
git-diff --no-relative overrides diff.relative config setting and prior git-diff --relative[=<path>] options. --- Documentation/diff-config.txt | 1 + Documentation/diff-options.txt | 4 +++ diff.c | 2 ++ t/t4045-diff-relative.sh | 56 +++++++++++++++++++++++++++++++++--------- 4 files changed, 51 insertions(+), 12 deletions(-)
Show changes to 4 files +49 −12
Documentation/diff-config.txt, Documentation/diff-options.txt, diff.c, t/t4045-diff-relative.sh
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 496e9b0..b8a7c60 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -107,6 +107,7 @@ diff.relative:: Show pathnames relative to the current directory and exclude changes outside this directory; equivalent to the 'git diff' option '--relative'. + Overridden by the '--no-relative' linkgit:git-diff[1] option. diff.renameLimit:: The number of files to consider when performing the copy/rename diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 6cb083a..7470b16 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -448,6 +448,10 @@ ifndef::git-format-patch[] not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument. + +--no-relative:: + Turn off relative pathnames, even when the configuration + file gives the default to do so. endif::git-format-patch[] -a:: diff --git a/diff.c b/diff.c index 03697a9..9e4ec1f 100644 --- a/diff.c +++ b/diff.c @@ -3703,6 +3703,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) DIFF_OPT_SET(options, RELATIVE_NAME); options->prefix = arg; } + else if (!strcmp(arg, "--no-relative")) + DIFF_OPT_CLR(options, RELATIVE_NAME); /* xdiff options */ else if (!strcmp(arg, "--minimal")) diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh index 8c8fe0b..b2764d5 100755 --- a/t/t4045-diff-relative.sh +++ b/t/t4045-diff-relative.sh @@ -12,8 +12,8 @@ test_expect_success 'setup' ' git commit -m one ' -check_diff() { -expect=$1; shift +store_diff_relative() { +expect=$1; cat >expected <<EOF diff --git a/$expect b/$expect new file mode 100644 @@ -23,29 +23,61 @@ index 0000000..25c05ef @@ -0,0 +1 @@ +other content EOF -test_expect_success "-p $*" " - git diff -p $* HEAD^ >actual && - test_cmp expected actual -" } -check_config() { -expect=$1; shift +store_diff_absolute() { +expect=$1; cat >expected <<EOF -diff --git a/$expect b/$expect +diff --git a/file1 b/file1 +new file mode 100644 +index 0000000..d95f3ad +--- /dev/null ++++ b/file1 +@@ -0,0 +1 @@ ++content +diff --git a/subdir/file2 b/subdir/file2 new file mode 100644 index 0000000..25c05ef --- /dev/null -+++ b/$expect ++++ b/subdir/file2 @@ -0,0 +1 @@ +other content EOF +} + +check_diff() { +store_diff_relative $1; shift +test_expect_success "-p $*" " + git diff -p $* HEAD^ >actual && + test_cmp expected actual +" +} + +check_option_no_relative() { +store_diff_absolute $1; shift +test_expect_success "-p $* --no-relative" " + git diff -p $* HEAD^ --no-relative >actual && + test_cmp expected actual +" +} + +check_config() { +store_diff_relative $1; shift test_expect_success "git-config diff.relative=true in $1" " (cd $1; git -c diff.relative=true diff -p HEAD^ >../actual) && test_cmp expected actual " } +check_config_no_relative() { +store_diff_absolute $1; shift +test_expect_success "--no-relative w/ git-config diff.relative=true in $1" " + (cd $1; git -c diff.relative=true diff --no-relative -p HEAD^ >../actual) && + test_cmp expected actual +" +} + + check_numstat() { expect=$1; shift cat >expected <<EOF @@ -81,12 +113,12 @@ test_expect_success "--raw $*" " " } -for type in diff numstat stat raw; do +for type in diff option_no_relative numstat stat raw; do check_$type file2 --relative=subdir/ check_$type file2 --relative=subdir check_$type dir/file2 --relative=sub done -for type in config; do +for type in config config_no_relative; do check_$type file2 subdir/ check_$type file2 subdir done
-- 1.9.1
