# git-gui: 'Unhandled 2 way diff marker:' for typechanged path 4 messages from 2010-10-25 to 2010-12-06. Participants: Bert Wesarg, Pat Thoyts. Thread: https://gitlist.dev/t/25546 ## Bert Wesarg, 2010-10-25 12:59 Subject: git-gui: 'Unhandled 2 way diff marker:' for typechanged path Message-ID: URL: https://gitlist.dev/e/AANLkTi%3DdA%2Bmj1KDpAgGAtg1S5Gt5wXAJ4zLd-tLob%3DDH%40mail.gmail.com ``` 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, 2010-10-28 12:27 Subject: [PATCH] git-gui: handle symlink replaced by file Message-ID: <8739rqqb4m.fsf@fox.patthoyts.tk> URL: https://gitlist.dev/e/8739rqqb4m.fsf%40fox.patthoyts.tk In-Reply-To: ``` 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 Signed-off-by: Pat Thoyts --- Bert Wesarg writes: >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, 2010-11-03 20:07 Subject: Re: [PATCH] git-gui: handle symlink replaced by file Message-ID: URL: https://gitlist.dev/e/AANLkTi%3DP%2BsKzYSkeS2-N%2BDerP3zdRgrDnuNuXbK0O89s%40mail.gmail.com In-Reply-To: <8739rqqb4m.fsf@fox.patthoyts.tk> ``` On Thu, Oct 28, 2010 at 14:27, Pat Thoyts 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, 2010-12-06 21:26 Subject: Re: [PATCH] git-gui: handle symlink replaced by file Message-ID: URL: https://gitlist.dev/e/AANLkTi%3DZxrnfjoXHHwUC8p7KwXiGgjXwGr%3D6BMBzjB6R%40mail.gmail.com In-Reply-To: ``` On Wed, Nov 3, 2010 at 21:07, Bert Wesarg wrote: > On Thu, Oct 28, 2010 at 14:27, Pat Thoyts > 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 > ```