Clemens Buchacher [off-list ref] writes:
On Sat, Aug 30, 2008 at 09:43:19PM +0200, Johannes Sixt wrote:
quoted
Clemens Buchacher schrieb:
quoted
git apply does not work correctly with zero-context patches. It does a
little better with --unidiff-zero.
No, NO, NOOOOO! This kills your data!
Okay. Since we have 'Stage Line for Commit', supporting this would be almost
pointless anyways. So let's forget about trying to fix this and simply
disable zero-context diff in git-gui, as per my original patch
[PATCH] git gui: show diffs with a minimum of 1 context line
Well, showing is Ok as long as you do not try pick and apply. Or did I
miss something?
On Sat, Aug 30, 2008 at 01:52:23PM -0700, Junio C Hamano wrote:
Well, showing is Ok as long as you do not try pick and apply. Or did I
miss something?
If I understand correctly git gui bases its patches on what it shows in the
diff window - which makes sense, because otherwise it would be a PITA to
find out which hunk the user actually wanted.
We could allow diffs without context and disable staging in that case, but I
suspect this would only confuse the user.
Clemens Buchacher [off-list ref] wrote:
On Sat, Aug 30, 2008 at 01:52:23PM -0700, Junio C Hamano wrote:
quoted
Well, showing is Ok as long as you do not try pick and apply. Or did I
miss something?
If I understand correctly git gui bases its patches on what it shows in the
diff window - which makes sense, because otherwise it would be a PITA to
find out which hunk the user actually wanted.
We could allow diffs without context and disable staging in that case, but I
suspect this would only confuse the user.
I agree. Lets just disallow zero-context diffs. Its far easier
for the user to understand the diff limit is 1.
--
Shawn.