{"thread":{"id":"18429","subject":"[PATCH RESEND] git-gui: Fix merge conflict display error when filename contains spaces","startedAt":"2009-03-20T07:52:58Z","lastAt":"2009-03-20T20:11:55Z","messageCount":2,"participants":["Jens Lehmann","Markus Heidelberg"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"108667","messageId":"49C34B5A.2040807@web.de","threadId":"18429","inReplyTo":null,"subject":"[PATCH RESEND] git-gui: Fix merge conflict display error when filename contains spaces","fromName":"Jens Lehmann","fromEmail":"jens.lehmann@web.de","sentAt":"2009-03-20T07:52:58Z","receivedAt":"2009-03-20T07:52:58Z","isPatch":true,"sender":{"key":"jens.lehmann@web.de","avatar":"https://avatars.githubusercontent.com/u/135220?v=4"},"body":"When a merge conflict occurs in a file with spaces in the filename, git-gui showed wrongly \"LOCAL: deleted\".\n\nSigned-off-by: Jens Lehmann <Jens.Lehmann@web.de>\n---\n\nResending this patch, as i have not received any reply so far.\n\nTo reproduce the error with git 1.6.2.1.136.g8e24, i used the following commands:\n  mkdir spaces\n  cd spaces/\n  git init\n  echo \"a\" >file\\ with\\ spaces\n  git add file\\ with\\ spaces \n  git commit -m a .\n  git checkout -b b\n  echo \"b\" >file\\ with\\ spaces\n  git commit -m b .\n  git checkout master\n  echo \"c\" >file\\ with\\ spaces\n  git commit -m c .\n  git merge b\n  git gui\ngit gui doesn't show the conflict markers as it should, displaying \"LOCAL: deleted\" instead (but an older git-gui works as expected).\n\nJens\n\n git-gui/lib/mergetool.tcl |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl\nindex eb2b4b5..3e1b42b 100644\n--- a/git-gui/lib/mergetool.tcl\n+++ b/git-gui/lib/mergetool.tcl\n@@ -88,7 +88,7 @@ proc merge_load_stages {path cont} {\n \tset merge_stages(3) {}\n \tset merge_stages_buf {}\n \n-\tset merge_stages_fd [eval git_read ls-files -u -z -- $path]\n+\tset merge_stages_fd [eval git_read ls-files -u -z -- {$path}]\n \n \tfconfigure $merge_stages_fd -blocking 0 -translation binary -encoding binary\n \tfileevent $merge_stages_fd readable [list read_merge_stages $merge_stages_fd $cont]\n-- \n1.6.2.1.215.g5d16f\n"},{"id":"108756","messageId":"200903202111.56090.markus.heidelberg@web.de","threadId":"18429","inReplyTo":"49C34B5A.2040807@web.de","subject":"Re: [PATCH RESEND] git-gui: Fix merge conflict display error when filename contains spaces","fromName":"Markus Heidelberg","fromEmail":"markus.heidelberg@web.de","sentAt":"2009-03-20T20:11:55Z","receivedAt":"2009-03-20T20:11:55Z","isPatch":true,"sender":{"key":"markus.heidelberg@web.de","avatar":"https://avatars.githubusercontent.com/u/6334512?v=4"},"body":"Jens Lehmann, 20.03.2009:\n> When a merge conflict occurs in a file with spaces in the filename,\n> git-gui showed wrongly \"LOCAL: deleted\".\n> \n> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>\n> ---\n> \n> Resending this patch, as i have not received any reply so far.\n\nYou should send git-gui patches to Shawn O. Pearce <spearce@spearce.org>,\nsince he is the maintainer, and CCing the git list.\nThis will raise the chance of a reply. Or maybe it will simply be\ncommited to http://repo.or.cz/w/git-gui.git without a reply.\n\nMarkus\n"}]}