{"thread":{"id":"18361","subject":"[PATCH] git-gui: Fix merge conflict display error when filename contains spaces","startedAt":"2009-03-17T20:56:15Z","lastAt":"2009-03-17T20:56:15Z","messageCount":1,"participants":["Jens Lehmann"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"108282","messageId":"983770303@web.de","threadId":"18361","inReplyTo":null,"subject":"[PATCH] git-gui: Fix merge conflict display error when filename contains spaces","fromName":"Jens Lehmann","fromEmail":"jens.lehmann@web.de","sentAt":"2009-03-17T20:56:15Z","receivedAt":"2009-03-17T20:56:15Z","isPatch":true,"sender":{"key":"jens.lehmann@web.de","avatar":"https://avatars.githubusercontent.com/u/135220?v=4"},"body":"From f548fd124ad3790b6ce3f30989fc3ed06c58b3dd Mon Sep 17 00:00:00 2001\nFrom: Jens Lehmann <Jens.Lehmann@web.de>\nDate: Tue, 17 Mar 2009 20:06:12 +0100\nSubject: [PATCH] git-gui: Fix merge conflict display error when filename contains spaces\n\nWhen 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\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\" (but my old git-gui from 1.5.3.3 works fine).\n\nJens\n\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.5.3.3\n\n____________________________________________________________________\nPsssst! Schon vom neuen WEB.DE MultiMessenger gehört? \nDer kann`s mit allen: http://www.produkte.web.de/messenger/?did=3123\n"}]}