Re: Lines missing from git diff-tree -p -c output?

Hi folks, $ git diff-tree -p -c HEAD d945a51b6ca22e6e8e550c53980d026f11b05158 diff --combined file index 3404f54,0eab113..e8c8c18 --- a/file +++ b/file @@@ -1,7 -1,5 +1,6 @@@ +LEFT BASE2 BASE3 BASE4 - BASE5 + BASE5MODIFIED BASE6 I found the spot in the code where this is

Re: Lines missing from git diff-tree -p -c output?

Matthijs Kooijman matth...@stdin.nl writes: $ git diff-tree -p -c HEAD d945a51b6ca22e6e8e550c53980d026f11b05158 diff --combined file index 3404f54,0eab113..e8c8c18 --- a/file +++ b/file @@@ -1,7 -1,5 +1,6 @@@ +LEFT BASE2 BASE3 BASE4 - BASE5 + BASE5MODIFIED BASE6 Here, the

Re: Lines missing from git diff-tree -p -c output?

Hi Junio, I think the coalescing of two adjacent hunks into one is painting leading lines interesting to show context but not worth showing deletion before it incorrectly. Yup, that seems to be the case. Does this patch fix the issue? Yes, it fixes the issue. However, I think that this

Re: Lines missing from git diff-tree -p -c output?

Matthijs Kooijman matth...@stdin.nl writes: Hi Junio, I think the coalescing of two adjacent hunks into one is painting leading lines interesting to show context but not worth showing deletion before it incorrectly. Yup, that seems to be the case. Does this patch fix the issue? Yes, it

Re: Lines missing from git diff-tree -p -c output?

Hi Junio, Could you explain why you think it hides the real problem, and what kind of future enhancement may break it? I think the differences is mostly in the locality of the fix. In my proposed patch, the no_pre_delete flag is never set on an interesting line because it is checked in the line

Re: Lines missing from git diff-tree -p -c output?

Matthijs Kooijman matth...@stdin.nl writes: Could you explain why you think it hides the real problem, and what kind of future enhancement may break it? I think the differences is mostly in the locality of the fix. In my proposed patch, the no_pre_delete flag is never set on an interesting