dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-09 09:34:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/diff-relative-cached-unmerged' into jch

Browse Source 
'git diff --relative' running with '--cached' has been corrected to
avoid a segfault when encountering unmerged paths outside the
prefix.

* jk/diff-relative-cached-unmerged:
  diff: ignore unmerged paths outside prefix with --relative --cached
This commit is contained in:
Junio C Hamano
2026-07-23 12:55:03 -07:00
parent f5cbf13ce7 88efab5c3b
commit 17443421b3
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff-lib.c
View File

@@ -467,7 +467,7 @@ static void do_oneway_diff(struct unpack_trees_options *o,
if (cached && idx && ce_stage(idx)) {
struct diff_filepair *pair;
pair = diff_unmerge(&revs->diffopt, idx->name);
if (tree)
if (pair && tree)
fill_filespec(pair->one, &tree->oid, 1,
tree->ce_mode);
return;

9
t/t4045-diff-relative.sh
View File

@@ -245,4 +245,13 @@ test_expect_failure 'diff --relative with change in subdir' '
test_cmp expected out
'
test_expect_success 'diff --relative --cached with change in subdir' '
git switch br3 &&
test_when_finished "git merge --abort" &&
test_must_fail git merge sub1 &&
echo file0 >expected &&
git -C subdir diff --relative --name-only --cached >out &&
test_cmp expected out
'
test_done