From: Laurent Arnoud <laurent@spkdev.net>
To: git@vger.kernel.org
Subject: [PATCH] diff: add config option relative
Date: Fri, 15 May 2020 17:57:06 +0200 [thread overview]
Message-ID: <20200515155706.GA1165062@spk-laptop> (raw)
The `diff.relative` boolean option set to `true` to show only changes on the
current directory and show relative pathnames.
Signed-off-by: Laurent Arnoud <laurent@spkdev.net>
---
Documentation/config/diff.txt | 4 +++
diff.c | 7 +++++
t/t9904-diff-relative-config.sh | 48 +++++++++++++++++++++++++++++++++
3 files changed, 59 insertions(+)
create mode 100755 t/t9904-diff-relative-config.sh
diff --git Documentation/config/diff.txt Documentation/config/diff.txt
index ff09f1cf73..1d311358d8 100644
--- Documentation/config/diff.txt
+++ Documentation/config/diff.txt
@@ -105,6 +105,10 @@ diff.mnemonicPrefix::
diff.noprefix::
If set, 'git diff' does not show any source or destination prefix.
+diff.relative::
+ If set to "true", 'git diff' does not show changes outside of the directory
+ and show pathnames relative.
+
diff.orderFile::
File indicating how to order files within a diff.
See the '-O' option to linkgit:git-diff[1] for details.
diff --git diff.c diff.c
index d1ad6a3c4a..24b7a0ae08 100644
--- diff.c
+++ diff.c
@@ -48,6 +48,7 @@ static const char *diff_order_file_cfg;
int diff_auto_refresh_index = 1;
static int diff_mnemonic_prefix;
static int diff_no_prefix;
+static int diff_relative;
static int diff_stat_graph_width;
static int diff_dirstat_permille_default = 30;
static struct diff_options default_diff_options;
@@ -386,6 +387,10 @@ int git_diff_ui_config(const char *var, const char *value, void *cb)
diff_no_prefix = git_config_bool(var, value);
return 0;
}
+ if (!strcmp(var, "diff.relative")) {
+ diff_relative = git_config_bool(var, value);
+ return 0;
+ }
if (!strcmp(var, "diff.statgraphwidth")) {
diff_stat_graph_width = git_config_int(var, value);
return 0;
@@ -4558,6 +4563,8 @@ void repo_diff_setup(struct repository *r, struct diff_options *options)
options->b_prefix = "b/";
}
+ options->flags.relative_name = diff_relative;
+
options->color_moved = diff_color_moved_default;
options->color_moved_ws_handling = diff_color_moved_ws_default;
diff --git t/t9904-diff-relative-config.sh t/t9904-diff-relative-config.sh
new file mode 100755
index 0000000000..a92d53ca25
--- /dev/null
+++ t/t9904-diff-relative-config.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+test_description='config diff.relative'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ git commit --allow-empty -m empty &&
+ echo content >file1 &&
+ mkdir subdir &&
+ echo other content >subdir/file2 &&
+ git add . &&
+ git commit -m one
+'
+
+check_diff () {
+ dir=$1
+ shift
+ expect=$1
+ shift
+ relative_opt=$1
+ shift
+ short_blob=$(git rev-parse --short "$(git hash-object subdir/file2)")
+ cat >expected <<-EOF
+ diff --git a/$expect b/$expect
+ new file mode 100644
+ index 0000000..$short_blob
+ --- /dev/null
+ +++ b/$expect
+ @@ -0,0 +1 @@
+ +other content
+ EOF
+ test_expect_success "-p $*" "
+ test_config -C $dir diff.relative $relative_opt &&
+ git -C '$dir' diff -p $* HEAD^ >actual &&
+ test_cmp expected actual
+ "
+}
+
+check_diff . file2 false --relative=subdir/
+check_diff . file2 false --relative=subdir
+check_diff . file2 true --relative=subdir/
+check_diff . file2 true --relative=subdir
+check_diff subdir file2 false --relative
+check_diff subdir file2 true --relative
+check_diff subdir file2 true
+
+test_done
--
2.26.2
next reply other threads:[~2020-05-15 16:04 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-15 15:57 Laurent Arnoud [this message]
2020-05-15 22:22 ` [PATCH] diff: add config option relative Philip Oakley
2020-05-16 17:30 ` Laurent Arnoud
2020-05-15 23:31 ` brian m. carlson
2020-05-16 0:04 ` Junio C Hamano
2020-05-16 17:35 ` Laurent Arnoud
2020-05-16 17:38 ` [PATCH v3] " Laurent Arnoud
2020-05-16 18:33 ` Phillip Wood
2020-05-16 19:40 ` [PATCH v4] " Laurent Arnoud
2020-05-17 2:14 ` Đoàn Trần Công Danh
2020-05-17 2:48 ` Danh Doan
2020-05-17 15:12 ` Junio C Hamano
2020-05-18 9:40 ` [PATCH v5] " Laurent Arnoud
2020-05-18 11:46 ` Shourya Shukla
2020-05-18 13:04 ` Đoàn Trần Công Danh
2020-05-18 17:25 ` Laurent Arnoud
2020-05-18 13:56 ` Đoàn Trần Công Danh
2020-05-18 16:57 ` Junio C Hamano
2020-05-18 19:12 ` Đoàn Trần Công Danh
2020-05-18 20:37 ` Junio C Hamano
2020-05-19 0:30 ` Đoàn Trần Công Danh
2020-05-19 18:00 ` Junio C Hamano
2020-05-19 19:39 ` [PATCH v7] " Laurent Arnoud
2020-05-19 23:01 ` Đoàn Trần Công Danh
2020-05-22 10:46 ` [PATCH v8] " Laurent Arnoud
2020-05-23 2:14 ` Đoàn Trần Công Danh
2020-05-22 10:48 ` [PATCH v7] " Laurent Arnoud
2020-05-18 17:03 ` [PATCH v5] " Junio C Hamano
2020-05-18 17:21 ` [PATCH v6] " Laurent Arnoud
2020-05-18 17:31 ` Junio C Hamano
2020-05-18 17:33 ` Junio C Hamano
2020-05-18 17:34 ` Eric Sunshine
2020-05-18 19:19 ` Đoàn Trần Công Danh
2020-05-18 20:02 ` Junio C Hamano
2020-05-18 17:32 ` [PATCH v5] " Laurent Arnoud
2020-05-18 16:19 ` Eric Sunshine
2020-05-18 17:26 ` Laurent Arnoud
2020-05-18 9:43 ` [PATCH v4] " Laurent Arnoud
2020-05-17 15:07 ` [PATCH v3] " Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200515155706.GA1165062@spk-laptop \
--to=laurent@spkdev.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).