diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-08 23:30:31 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-08 23:30:31 +0300 |
| commit | c8f491668e46d66290aec97caaf94fe2c1ecccbd (patch) | |
| tree | f2b793ddaf748fd0d11c2394d9fb24ecbd07d68a /diff-lib.c | |
| parent | 85246a7054a6d20a1dc7ccc31e382493332374a4 (diff) | |
| parent | 8174627b3d32dc80cb477b3fa46971955f26c6b2 (diff) | |
Merge branch 'dd/diff-files-unmerged-fix'
"git diff --relative" segfaulted and/or produced incorrect result
when there are unmerged paths.
* dd/diff-files-unmerged-fix:
diff-lib: ignore paths that are outside $cwd if --relative asked
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/diff-lib.c b/diff-lib.c index f9eadc4fc1..ca085a03ef 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -117,6 +117,10 @@ int run_diff_files(struct rev_info *revs, unsigned int option) if (!ce_path_match(istate, ce, &revs->prune_data, NULL)) continue; + if (revs->diffopt.prefix && + strncmp(ce->name, revs->diffopt.prefix, revs->diffopt.prefix_length)) + continue; + if (ce_stage(ce)) { struct combine_diff_path *dpath; struct diff_filepair *pair; |