Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-gui: Fix merge conflict display error when filename contains spaces
author
Jens Lehmann
<Jens.Lehmann@web.de>
Fri, 20 Mar 2009 07:48:55 +0000
(08:48 +0100)
committer
Shawn O. Pearce
<spearce@spearce.org>
Fri, 20 Mar 2009 21:44:28 +0000
(14:44 -0700)
When a merge conflict occurs in a file with spaces in the filename,
git-gui showed wrongly "LOCAL: deleted".
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
lib/mergetool.tcl
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
379f84b
)
diff --git
a/lib/mergetool.tcl
b/lib/mergetool.tcl
index eb2b4b56a4db4c20727432c7a71d5192d580ce9e..3e1b42beb0d05f12a6fe7913aff14091cecac32c 100644
(file)
--- a/
lib/mergetool.tcl
+++ b/
lib/mergetool.tcl
@@
-88,7
+88,7
@@
proc merge_load_stages {path cont} {
set merge_stages(3) {}
set merge_stages_buf {}
- set merge_stages_fd [eval git_read ls-files -u -z --
$path
]
+ set merge_stages_fd [eval git_read ls-files -u -z --
{$path}
]
fconfigure $merge_stages_fd -blocking 0 -translation binary -encoding binary
fileevent $merge_stages_fd readable [list read_merge_stages $merge_stages_fd $cont]