threads / discuss / 25546

git-gui: 'Unhandled 2 way diff marker:' for typechanged path

Subject: git-gui: 'Unhandled 2 way diff marker:' for typechanged path

## tl;dr

4 messages between Oct 25, 2010 and Dec 6, 2010.

replies: 3people: 2as markdown or json

Bert Wesarg· Oct 25, 2010, 12:59 UTC · lore

Hi,

I get this error from git gui after I changed a symlink to a file:

error: Unhandled 2 way diff marker: {d}

To reproduce:

$ git init $ ln -s bar foo $ git add foo $ git commit -m "add foo link" $ rm foo $ echo bar >foo $ git gui error: Unhandled 2 way diff marker: {d}

I may have a look into this by my self in the long term, but maybe someone is faster than me.

Regards, Bert

Pat Thoyts· Oct 28, 2010, 12:27 UTC · re: Bert Wesarg · lore

[PATCH] git-gui: handle symlink replaced by file

If a symlink is replaced by a regular file an error message was emitted on stdout. This patch adds recognition of this case.

Reported-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---

Bert Wesarg <bert.wesarg@googlemail.com> writes:

Show 19 quoted lines

>Hi,
>
>I get this error from git gui after I changed a symlink to a file:
>
>error: Unhandled 2 way diff marker: {d}
>
>To reproduce:
>
>$ git init
>$ ln -s bar foo
>$ git add foo
>$ git commit -m "add foo link"
>$ rm foo
>$ echo bar >foo
>$ git gui
>error: Unhandled 2 way diff marker: {d}
>
>I may have a look into this by my self in the long term, but maybe
>someone is faster than me.

This patch just handles the second segment without generating the error really. It doesn't attempt to do any pretty output.

 lib/diff.tcl |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/lib/diff.tcl b/lib/diff.tcl
index c628750..4d041fa 100644
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -428,6 +428,14 @@ proc read_diff {fd cont_info} {
 					set tags d_+
 				}
 			}
+			{d} {
+				if {[string match {diff --git *} $line]} {
+					set ::current_diff_inheader 1
+					continue
+				} else {
+					puts "error: unrecognized operation: '$line'"
+				}
+			}
 			default {
 				puts "error: Unhandled 2 way diff marker: {$op}"
 				set tags {}

-- 
1.7.3.1.msysgit.0

Bert Wesarg· Nov 3, 2010, 20:07 UTC · re: Pat Thoyts · lore

Re: [PATCH] git-gui: handle symlink replaced by file

On Thu, Oct 28, 2010 at 14:27, Pat Thoyts <patthoyts@users.sourceforge.net> wrote:

> This patch just handles the second segment without generating the error
> really. It doesn't attempt to do any pretty output.

Thanks for the patch. I haven't test it yet. Actually I can't find documentation, that git outputs two diffs when the path changes the type. And I have no idea how to present this in git gui.

Bert

Bert Wesarg· Dec 6, 2010, 21:26 UTC · re: Bert Wesarg · lore

Re: [PATCH] git-gui: handle symlink replaced by file

On Wed, Nov 3, 2010 at 21:07, Bert Wesarg <bert.wesarg@googlemail.com> wrote:

Show 8 quoted lines

> On Thu, Oct 28, 2010 at 14:27, Pat Thoyts
> <patthoyts@users.sourceforge.net> wrote:
>> This patch just handles the second segment without generating the error
>> really. It doesn't attempt to do any pretty output.
>
> Thanks for the patch. I haven't test it yet. Actually I can't find
> documentation, that git outputs two diffs when the path changes the
> type. And I have no idea how to present this in git gui.

I have a better fix for this. But haven't the time to send it yet.

Bert

>
> Bert
>