Am 3/13/2013 22:21, schrieb Antoine Pelisse:
Currently, it's not possible to use the space-ignoring options (-b, -w,
--ignore-space-at-eol) with combined diff. It makes it pretty impossible
to read a merge between a branch that changed all tabs to spaces, and a
branch with functional changes.
Johannes Sixt j.s...@viscovery.net writes:
This form of 'echo' is not sufficiently portable. How about:
tr -d Q -\EOF test
always coalesce
eol space coalesce Q
...
EOF
Much better.
+test_expect_success 'check combined output (no ignore space)' '
+git show
On Thu, Mar 14, 2013 at 4:31 PM, Junio C Hamano gits...@pobox.com wrote:
Johannes Sixt j.s...@viscovery.net writes:
This form of 'echo' is not sufficiently portable. How about:
tr -d Q -\EOF test
always coalesce
eol space coalesce Q
...
EOF
Much better.
Currently, it's not possible to use the space-ignoring options (-b, -w,
--ignore-space-at-eol) with combined diff. It makes it pretty impossible
to read a merge between a branch that changed all tabs to spaces, and a
branch with functional changes.
Pass diff flags to diff engine, so that combined
Antoine Pelisse apeli...@gmail.com writes:
Currently, it's not possible to use the space-ignoring options (-b, -w,
--ignore-space-at-eol) with combined diff. It makes it pretty impossible
to read a merge between a branch that changed all tabs to spaces, and a
branch with functional changes.
Antoine Pelisse apeli...@gmail.com writes:
OK, I added some tests and coalesce similar lost lines (using the same flags
we used for diff.
Hmph, why doesn't this pass its own tests?
+test_expect_success 'check combined output (no ignore space)' '
+ git show | test_i18ngrep ^-\s*eol
That should be reviewed carefully as I'm not exactly sure that does make
sense with the way combined-diff works.
Still it seems natural to me to be able to remove the space in combined
diff as we do with normal diff. Especially as I unfortunately have to
deal with many space + feature merges
Antoine Pelisse apeli...@gmail.com writes:
It feels incorrect to me to coalsesce - 5 and - 5 as it might
look incorrect to the user. But still the idea is appealing.
The users already need to see that when reading a regular patch with
one or more context lines and -b/-w/etc., anyway. The
On Mon, Mar 4, 2013 at 7:36 PM, Junio C Hamano gits...@pobox.com wrote:
Antoine Pelisse apeli...@gmail.com writes:
It feels incorrect to me to coalsesce - 5 and - 5 as it might
look incorrect to the user. But still the idea is appealing.
The users already need to see that when reading a
Currently, it's not possible to use the space-ignoring options (-b, -w,
--ignore-space-at-eol) with combined diff. It makes it pretty impossible
to read a merge between a branch that changed all tabs to spaces, and a
branch with functional changes.
Pass diff flags to diff engine, so that combined
Antoine Pelisse apeli...@gmail.com writes:
Currently, it's not possible to use the space-ignoring options (-b, -w,
--ignore-space-at-eol) with combined diff. It makes it pretty impossible
to read a merge between a branch that changed all tabs to spaces, and a
branch with functional changes.
11 matches
Mail list logo
