added git-config support for diff.relative setting

By default, git-diff shows changes and pathnames relative to the repository root. Setting the diff.relative config option to "true" shows pathnames relative to the current directory and excludes changes outside this directory.

---
 Documentation/diff-config.txt |  6 ++++++
 diff.c                        |  8 ++++++++
 t/t4045-diff-relative.sh      | 21 +++++++++++++++++++++
 3 files changed, 35 insertions(+)

index b001779..10f183f 100644
@@ -182,3 +182,9 @@ diff.algorithm::
 	low-occurrence common elements".
 --
 +
+
+diff.relative::
+	By default, linkgit:git-diff[1] shows changes and pathnames
+	relative to the repository root. Setting this variable to
+	`true` shows pathnames relative to the current directory and
+	excludes changes outside this directory.

index d1bd534..22daa2f 100644
@@ -270,6 +270,14 @@ int git_diff_basic_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 
+	if (!strcmp(var, "diff.relative")) {
+		if (git_config_bool(var, value))
+			DIFF_OPT_SET(&default_diff_options, RELATIVE_NAME);
+		else
+			DIFF_OPT_CLR(&default_diff_options, RELATIVE_NAME);
+		return 0;
+	}
+
 	if (starts_with(var, "submodule."))
 		return parse_submodule_config_option(var, value);
 

index 3950f50..8c8fe0b 100755
@@ -29,6 +29,23 @@ test_expect_success "-p $*" "
 "
 }
 
+check_config() {
+expect=$1; shift
+cat >expected <<EOF
+diff --git a/$expect b/$expect
+new file mode 100644
+index 0000000..25c05ef
+--- /dev/null
++++ b/$expect
+@@ -0,0 +1 @@
++other content
+EOF
+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_numstat() {
 expect=$1; shift
 cat >expected <<EOF

@@ -69,5 +86,9 @@ for type in diff numstat stat raw; do
 	check_$type file2 --relative=subdir
 	check_$type dir/file2 --relative=sub
 done
+for type in config; do
+	check_$type file2 subdir/
+	check_$type file2 subdir
+done
 
 test_done

1.9.1

That is quite manageable. I was concerned that --relative changes the UI (relative paths) and behavior (excluding files outside the current directory), which might not be clear if placed in just the UI component. You make a great point that git_diff_basic_config drives other commands though, like git-bisect, which --relative would not effect.

-----Original Message-----
From: Duy Nguyen <[email protected]>
Sent: 12/11/2014 08:37 AM
To: Kelson <[email protected]>
CC: Git Mailing List <[email protected]>
Subject: Re: [PATCH] added git-config support for diff.relative setting

By default, git-diff shows changes and pathnames relative to the repository root. Setting the diff.relative config option to "true" shows pathnames relative to the current directory and excludes changes outside this directory.

---
 Documentation/diff-config.txt |  6 ++++++
 diff.c                        |  8 ++++++++
 t/t4045-diff-relative.sh      | 21 +++++++++++++++++++++
 3 files changed, 35 insertions(+)

index b001779..10f183f 100644
@@ -182,3 +182,9 @@ diff.algorithm::
 	low-occurrence common elements".
 --
 +
+
+diff.relative::
+	By default, linkgit:git-diff[1] shows changes and pathnames
+	relative to the repository root. Setting this variable to
+	`true` shows pathnames relative to the current directory and
+	excludes changes outside this directory.

index d1bd534..03697a9 100644
@@ -223,6 +223,14 @@ int git_diff_ui_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 
+	if (!strcmp(var, "diff.relative")) {
+		if (git_config_bool(var, value))
+			DIFF_OPT_SET(&default_diff_options, RELATIVE_NAME);
+		else
+			DIFF_OPT_CLR(&default_diff_options, RELATIVE_NAME);
+		return 0;
+	}
+
 	if (git_color_config(var, value, cb) < 0)
 		return -1;
 

index 3950f50..8c8fe0b 100755
@@ -29,6 +29,23 @@ test_expect_success "-p $*" "
 "
 }
 
+check_config() {
+expect=$1; shift
+cat >expected <<EOF
+diff --git a/$expect b/$expect
+new file mode 100644
+index 0000000..25c05ef
+--- /dev/null
++++ b/$expect
+@@ -0,0 +1 @@
++other content
+EOF
+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_numstat() {
 expect=$1; shift
 cat >expected <<EOF

@@ -69,5 +86,9 @@ for type in diff numstat stat raw; do
 	check_$type file2 --relative=subdir
 	check_$type dir/file2 --relative=sub
 done
+for type in config; do
+	check_$type file2 subdir/
+	check_$type file2 subdir
+done
 
 test_done

1.9.1

By default, git-diff shows changes and pathnames relative to the repository root. Setting diff.relative to "true" shows pathnames relative to the current directory and excludes changes outside this directory.

---
 Documentation/diff-config.txt |  5 +++++
 diff.c                        |  8 ++++++++
 t/t4045-diff-relative.sh      | 21 +++++++++++++++++++++
 3 files changed, 34 insertions(+)

index b001779..496e9b0 100644
@@ -103,6 +103,11 @@ diff.orderfile::
 	one shell glob pattern per line.
 	Can be overridden by the '-O' option to linkgit:git-diff[1].
 
+diff.relative::
+	Show pathnames relative to the current directory and exclude
+	changes outside this directory; equivalent to the 'git diff'
+	option '--relative'.
+
 diff.renameLimit::
 	The number of files to consider when performing the copy/rename
 	detection; equivalent to the 'git diff' option '-l'.

index d1bd534..03697a9 100644
@@ -223,6 +223,14 @@ int git_diff_ui_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 
+	if (!strcmp(var, "diff.relative")) {
+		if (git_config_bool(var, value))
+			DIFF_OPT_SET(&default_diff_options, RELATIVE_NAME);
+		else
+			DIFF_OPT_CLR(&default_diff_options, RELATIVE_NAME);
+		return 0;
+	}
+
 	if (git_color_config(var, value, cb) < 0)
 		return -1;
 

index 3950f50..8c8fe0b 100755
@@ -29,6 +29,23 @@ test_expect_success "-p $*" "
 "
 }
 
+check_config() {
+expect=$1; shift
+cat >expected <<EOF
+diff --git a/$expect b/$expect
+new file mode 100644
+index 0000000..25c05ef
+--- /dev/null
++++ b/$expect
+@@ -0,0 +1 @@
++other content
+EOF
+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_numstat() {
 expect=$1; shift
 cat >expected <<EOF

@@ -69,5 +86,9 @@ for type in diff numstat stat raw; do
 	check_$type file2 --relative=subdir
 	check_$type dir/file2 --relative=sub
 done
+for type in config; do
+	check_$type file2 subdir/
+	check_$type file2 subdir
+done
 
 test_done

1.9.1

By default, git-diff shows changes and pathnames relative to the repository root. Setting diff.relative to "true" shows pathnames relative to the current directory and excludes changes outside this directory.

---
 Documentation/diff-config.txt |  5 +++++
 diff.c                        |  8 ++++++++
 t/t4045-diff-relative.sh      | 21 +++++++++++++++++++++
 3 files changed, 34 insertions(+)

index b001779..496e9b0 100644
@@ -103,6 +103,11 @@ diff.orderfile::
     one shell glob pattern per line.
     Can be overridden by the '-O' option to linkgit:git-diff[1].
 
+diff.relative::
+    Show pathnames relative to the current directory and exclude
+    changes outside this directory; equivalent to the 'git diff'
+    option '--relative'.
+
 diff.renameLimit::
     The number of files to consider when performing the copy/rename
     detection; equivalent to the 'git diff' option '-l'.

index d1bd534..03697a9 100644
@@ -223,6 +223,14 @@ int git_diff_ui_config(const char *var, const char *value, void *cb)
         return 0;
     }
 
+    if (!strcmp(var, "diff.relative")) {
+        if (git_config_bool(var, value))
+            DIFF_OPT_SET(&default_diff_options, RELATIVE_NAME);
+        else
+            DIFF_OPT_CLR(&default_diff_options, RELATIVE_NAME);
+        return 0;
+    }
+
     if (git_color_config(var, value, cb) < 0)
         return -1;
 

index 3950f50..8c8fe0b 100755
@@ -29,6 +29,23 @@ test_expect_success "-p $*" "
 "
 }
 
+check_config() {
+expect=$1; shift
+cat >expected <<EOF
+diff --git a/$expect b/$expect
+new file mode 100644
+index 0000000..25c05ef
+--- /dev/null
++++ b/$expect
+@@ -0,0 +1 @@
++other content
+EOF
+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_numstat() {
 expect=$1; shift
 cat >expected <<EOF

@@ -69,5 +86,9 @@ for type in diff numstat stat raw; do
     check_$type file2 --relative=subdir
     check_$type dir/file2 --relative=sub
 done
+for type in config; do
+    check_$type file2 subdir/
+    check_$type file2 subdir
+done
 
 test_done

1.9.1

added --no-relative option for git-diff (code, documentation, and tests)

--no-relative overrides --relative causing a return to standard behavior

---
 Documentation/diff-options.txt |  4 ++++
 diff.c                         |  2 ++
 t/t4045-diff-relative.sh       | 46 
+++++++++++++++++++++++++++++++++++++++---
 3 files changed, 49 insertions(+), 3 deletions(-)

index 6cb083a..2b15050 100644
@@ -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 and include all changes in the
+	repository.
 endif::git-format-patch[]
 
 -a::

index d1bd534..7bceba8 100644
@@ -3695,6 +3695,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"))

--
1.9.1

added --no-relative option for git-diff (code, documentation, and tests)

--no-relative overrides --relative causing a return to standard behavior

---
 Documentation/diff-options.txt |  4 ++++
 diff.c                         |  2 ++
 t/t4045-diff-relative.sh       | 46 
+++++++++++++++++++++++++++++++++++++++---
 3 files changed, 49 insertions(+), 3 deletions(-)

index 6cb083a..2b15050 100644
@@ -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 and include all changes in the
+	repository.
 endif::git-format-patch[]
 
 -a::

index d1bd534..7bceba8 100644
@@ -3695,6 +3695,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"))

--
1.9.1

Please. No format=flawed. Really.

"diff: teach --no-relative to override earlier --relative" or something. Saying the affeced area upfront, terminated with a colon ':', will make it easier to spot in "git shortlog" output later.

Also this step is not about --no-relative and diff.relative but is only about --no-relative option.

"Add --no-relative option..."; we write in imperative, as if we are giving an order to the project secretary to "make the code do/be so".

OK (modulo missing full-stop).

Please also have

From: Brandon Phillips <[email protected]>

as the first line of the body of your e-mail message, if you are letting your MUA only give your e-mail address without name. Alternatively, please ask/configure your MUA to put your name as well as your address on From: header of the e-mail (which is preferrable).

	$ cd t
	$ git show --relative=Documentation --no-relative --relative

	$ cd t
	$ git show --relative

I'll figure out the line-wrapping.

Should I submit as two independent patches then? I took the approach of splitting them out into 1/2 vs 2/2 to distinguish, but it sounds like that isn't optimal.

...

diff_setup_done NULLs options->prefix when DIFF_OPT_TST(options, RELATIVE_NAME) is cleared (--no-relative clears this option).

On review, this may be a bad approach though. Non-locality makes it harder to follow/understand and introduces a subtle bug.

current:  "git-diff --relative=path --no-relative --relative" == "git-diff --relative=path"
expected: "git-diff --relative=path --no-relative --relative" == "git-diff --relative"

Agreed; update to come.

-----Original Message-----
From: Junio C Hamano <[email protected]>
Sent: 01/07/2015 01:09 PM
To: [email protected]
CC: Git Mailing List <[email protected]>, Philip Oakley <[email protected]>, Duy Nguyen <[email protected]>, Jonathan Nieder <[email protected]>
Subject: Re: [PATCH 1/2] support for --no-relative and diff.relative

Please. No format=flawed. Really.

"diff: teach --no-relative to override earlier --relative" or something. Saying the affeced area upfront, terminated with a colon ':', will make it easier to spot in "git shortlog" output later.

Also this step is not about --no-relative and diff.relative but is only about --no-relative option.

"Add --no-relative option..."; we write in imperative, as if we are giving an order to the project secretary to "make the code do/be so".

OK (modulo missing full-stop).

Please also have

From: Brandon Phillips <[email protected]>

as the first line of the body of your e-mail message, if you are letting your MUA only give your e-mail address without name. Alternatively, please ask/configure your MUA to put your name as well as your address on From: header of the e-mail (which is preferrable).

	$ cd t
	$ git show --relative=Documentation --no-relative --relative

	$ cd t
	$ git show --relative

They are indeed better to be 1/2 and 2/2; they do not have to share the same subject, though. 1/2 now adds only --no-relative and makes sure an earlier --relative is cancelled without even knowing that diff.relative might appear in the future (well, you may know that, but the system with only 1/2 applied without 2/2 would work perfectly fine). 2/2 adds diff.relative and makes sure --no-relative cancels its effect as well.

Exactly.

Addendum.

It was only a "half-way rhetorical question", because I am willing to be persuaded that diff.relative=true/ vs diff.relative=true is *not* too subtle/confusing to be a good idea, if enough people whose judgement I trust agrees.

The above does not tell any lie, but it is mostly a description of what "--relative" does. I think the main point of this change is that by configuring a variable "diff.relative" (and forget about it) you do not have to keep saying "--relative" from the command line, so that is how you should "sell" this change to others, I think.

No signoff?