threads / patch / 48383

patchUse the diff.rename configuration for git status

Subject: [PATCH 0/1] Use the diff.rename configuration for git status

## tl;dr

3 messages between Apr 30, 2018 and Apr 30, 2018. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Eckhard S. Maaß· Apr 30, 2018, 09:34 UTC · lore
Hello,

I have been irritated that the output of git status does not adhere to the same diff settings than the other commands like git show. I think it is more of an oversight and git status is also intended to show the same kind of rename detection (without any more options passed a long the command line) than other similar commands do. This patch should fix that issue.

I am aware that this change would also change how the porcelain variations of git status behave for rename detection. However, I could not find any hints that the rename detection should be fixed. As the default would not change (50% rename threshold), this still seems reasonable to me.

As for documentation, I am unsure what and where to add: for me it seems like git status should already behave that way, but it is a change and so far none else seemed to have brought it up.

Greetings, Eckhard

Eckhard S. Maaß (1):
  wt-status: use rename settings from init_diff_ui_defaults
 builtin/commit.c       |  2 +-
 t/t4001-diff-rename.sh | 12 ++++++++++++
 wt-status.c            |  4 ----
 3 files changed, 13 insertions(+), 5 deletions(-)
-- 
2.17.0.252.gfe0a9eaf31
Eckhard S. Maaß· Apr 30, 2018, 09:34 UTC · re: Eckhard S. Maaß · lore

[PATCH 1/1] wt-status: use rename settings from init_diff_ui_defaults

Since the very beginning, git status behaved differently for rename detection than other rename aware commands like git log or git show as it has the use of rename hard coded into it. After 5404c116aa ("diff: activate diff.renames by default", 2016-02-25) the default behaves the same by coincidence, but a work flow like

    - git add .
    - git status
    - git commit
    - git show

should give you the same information on renames (and/or copies if activated) accordingly to the diff.renames setting.

With this commit the hard coded rename settings are dropped from the status command.

Signed-off-by: Eckhard S. Maaß <eckhard.s.maass@gmail.com>
---
 builtin/commit.c       |  2 +-
 t/t4001-diff-rename.sh | 12 ++++++++++++
 wt-status.c            |  4 ----
 3 files changed, 13 insertions(+), 5 deletions(-)
Show changes to 3 files +13 −5

builtin/commit.c, t/t4001-diff-rename.sh, wt-status.c

diff --git a/builtin/commit.c b/builtin/commit.c
index 5571d4a3e2..5240f11225 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -161,9 +161,9 @@ static void determine_whence(struct wt_status *s)
 static void status_init_config(struct wt_status *s, config_fn_t fn)
 {
 	wt_status_prepare(s);
+	init_diff_ui_defaults();
 	git_config(fn, s);
 	determine_whence(s);
-	init_diff_ui_defaults();
 	s->hints = advice_status_hints; /* must come after git_config() */
 }
 
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index a07816d560..bf4030371a 100755
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -138,6 +138,18 @@ test_expect_success 'favour same basenames over different ones' '
 	test_i18ngrep "renamed: .*path1 -> subdir/path1" out
 '
 
+test_expect_success 'test diff.renames=true for git status' '
+	git -c diff.renames=true status >out &&
+	test_i18ngrep "renamed: .*path1 -> subdir/path1" out
+'
+
+test_expect_success 'test diff.renames=false for git status' '
+	git -c diff.renames=false status >out &&
+	test_i18ngrep ! "renamed: .*path1 -> subdir/path1" out &&
+	test_i18ngrep "new file: .*subdir/path1" out &&
+	test_i18ngrep "deleted: .*[^/]path1" out
+'
+
 test_expect_success 'favour same basenames even with minor differences' '
 	git show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&
 	git status >out &&
diff --git a/wt-status.c b/wt-status.c
index 50815e5faf..32f3bcaebd 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -625,9 +625,6 @@ static void wt_status_collect_changes_index(struct wt_status *s)
 	rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 	rev.diffopt.format_callback = wt_status_collect_updated_cb;
 	rev.diffopt.format_callback_data = s;
-	rev.diffopt.detect_rename = DIFF_DETECT_RENAME;
-	rev.diffopt.rename_limit = 200;
-	rev.diffopt.break_opt = 0;
 	copy_pathspec(&rev.prune_data, &s->pathspec);
 	run_diff_index(&rev, 1);
 }
@@ -985,7 +982,6 @@ static void wt_longstatus_print_verbose(struct wt_status *s)
 	setup_revisions(0, NULL, &rev, &opt);
 
 	rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
-	rev.diffopt.detect_rename = DIFF_DETECT_RENAME;
 	rev.diffopt.file = s->fp;
 	rev.diffopt.close_file = 0;
 	/*

-- 
2.17.0.252.gfe0a9eaf31
Elijah Newren· Apr 30, 2018, 19:27 UTC · re: Eckhard S. Maaß · lore

Re: [PATCH 1/1] wt-status: use rename settings from init_diff_ui_defaults

Hi Eckhard,

On Mon, Apr 30, 2018 at 2:34 AM, Eckhard S. Maaß <eckhard.s.maass@googlemail.com> wrote:

Show 13 quoted lines
> Since the very beginning, git status behaved differently for rename
> detection than other rename aware commands like git log or git show as
> it has the use of rename hard coded into it.  After 5404c116aa ("diff:
> activate diff.renames by default", 2016-02-25) the default behaves the
> same by coincidence, but a work flow like
>
>     - git add .
>     - git status
>     - git commit
>     - git show
>
> should give you the same information on renames (and/or copies if
> activated) accordingly to the diff.renames setting.

Thanks for sending this change in. I agree with the logic. I think the last sentence needs a s/diff.renames setting/diff.renames and diff.renameLimit settings/, though, because...

Show 10 quoted lines
> With this commit the hard coded rename settings are dropped from the
> status command.
>
> Signed-off-by: Eckhard S. Maaß <eckhard.s.maass@gmail.com>
> ---
>  builtin/commit.c       |  2 +-
>  t/t4001-diff-rename.sh | 12 ++++++++++++
>  wt-status.c            |  4 ----
>  3 files changed, 13 insertions(+), 5 deletions(-)
>
<snip>
Show 10 quoted lines
> diff --git a/wt-status.c b/wt-status.c
> index 50815e5faf..32f3bcaebd 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -625,9 +625,6 @@ static void wt_status_collect_changes_index(struct wt_status *s)
>         rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
>         rev.diffopt.format_callback = wt_status_collect_updated_cb;
>         rev.diffopt.format_callback_data = s;
> -       rev.diffopt.detect_rename = DIFF_DETECT_RENAME;
> -       rev.diffopt.rename_limit = 200;

By removing the hard-coded value of 200, the rename limit will instead match whatever the user specified (or, if they didn't specify anything, then the value of 400 from diff_rename_limit_default). I think that's a good change, for the exact same reasons as you argue for making diff.renames be used everywhere in the commit message, it just needs to be mentioned in the commit message.

Everything else in the patch looks good to me, so with that change feel free to add:

Reviewed-by: Elijah Newren <newren@gmail.com>

← back to recent threads