Abhijeet Sonar <abhijeet.nkt@xxxxxxxxx> writes:
> When describe is run with 'dirty' flag, we refresh the index
> to make sure it is in sync with the filesystem before
> determining if the working tree is dirty. However, this is
> not done for the codepath where the 'broken' flag is used.
>
> This causes `git describe --broken --dirty` to false
> positively report the worktree being dirty if a file has
> different stat info than what is recorded in the index.
> Running `git update-index -q --refresh` to refresh the index
> before running diff-index fixes the problem.
>
> Also add tests to deliberately update stat info of a
> file before running describe to verify it behaves correctly.
>
> Reported-by: Paul Millar <paul.millar@xxxxxxx>
> Suggested-by: Junio C Hamano <gitster@xxxxxxxxx>
> Helped-by: Junio C Hamano <gitster@xxxxxxxxx>
> Helped-by: Phillip Wood <phillip.wood123@xxxxxxxxx>
> Signed-off-by: Abhijeet Sonar <abhijeet.nkt@xxxxxxxxx>
> ---
As I screwed up with the suggestion to do child_process_clear()
after a failed run_command(), let me fix that up. A suggested
change that can be squashed into this patch is attached at the end.
* (style) a blank line between a block of variable declarations and
the first statement;
* run_command(&cp) cleans cp so no need for separate
child_process_clear(&cp);
* but child_process_init(&cp) is needed, just as 4d0984be (fsck: do
not reuse child_process structs, 2018-11-12) explains, before
reusing the structure for a separate call.
* instead of "replace with a different file" which relies on having
a working inum, use "test-tool chmtime" to reliably force dirty
mtime.
* everybody else compares "actual" against "expect", not
"expected". imitate them.
* test "--dirty" and "--dirty --broken" separately in two separate
tests.
Thanks.
builtin/describe.c | 5 +++--
t/t6120-describe.sh | 28 ++++++++++++++++++++--------
2 files changed, 23 insertions(+), 10 deletions(-)
diff --git c/builtin/describe.c w/builtin/describe.c
index a58f6134f0..e936d2c19f 100644
--- c/builtin/describe.c
+++ w/builtin/describe.c
@@ -649,13 +649,14 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
if (argc == 0) {
if (broken) {
struct child_process cp = CHILD_PROCESS_INIT;
+
strvec_pushv(&cp.args, update_index_args);
cp.git_cmd = 1;
cp.no_stdin = 1;
cp.no_stdout = 1;
- if (run_command(&cp))
- child_process_clear(&cp);
+ run_command(&cp);
+ child_process_init(&cp);
strvec_pushv(&cp.args, diff_index_args);
cp.git_cmd = 1;
cp.no_stdin = 1;
diff --git c/t/t6120-describe.sh w/t/t6120-describe.sh
index 6c396e7abc..79e0f19deb 100755
--- c/t/t6120-describe.sh
+++ w/t/t6120-describe.sh
@@ -672,6 +672,7 @@ test_expect_success 'setup misleading taggerdates' '
check_describe newer-tag-older-commit~1 --contains unique-file~2
test_expect_success 'describe --dirty with a file with changed stat' '
+ test_when_finished "rm -fr stat-dirty" &&
git init stat-dirty &&
(
cd stat-dirty &&
@@ -680,18 +681,29 @@ test_expect_success 'describe --dirty with a file with changed stat' '
git add file &&
git commit -m A &&
git tag A -a -m A &&
+ echo "A" >expect &&
- cat file >file.new &&
- mv file.new file &&
+ test-tool chmtime -10 file &&
git describe --dirty >actual &&
- echo "A" >expected &&
- test_cmp expected actual &&
+ test_cmp expect actual
+ )
+'
+
+test_expect_success 'describe --broken --dirty with a file with changed stat' '
+ test_when_finished "rm -fr stat-dirty" &&
+ git init stat-dirty &&
+ (
+ cd stat-dirty &&
- cat file >file.new &&
- mv file.new file &&
+ echo A >file &&
+ git add file &&
+ git commit -m A &&
+ git tag A -a -m A &&
+ echo "A" >expect &&
+
+ test-tool chmtime -10 file &&
git describe --dirty --broken >actual &&
- echo "A" >expected &&
- test_cmp expected actual
+ test_cmp expect actual
)
'
