summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGerrit Pape <pape@smarden.org>2007-09-07 17:16:59 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-09-09 03:06:26 (GMT)
commit0b883ab30c869c4f22a19e49aedc1604d335cd91 (patch)
tree5baa8459624733fa66238245a79faac3025cb96d /lib
parent047d94d505c9837a60c28e121de65471dadce74b (diff)
downloadgit-0b883ab30c869c4f22a19e49aedc1604d335cd91.zip
git-0b883ab30c869c4f22a19e49aedc1604d335cd91.tar.gz
git-0b883ab30c869c4f22a19e49aedc1604d335cd91.tar.bz2
git-gui: lib/index.tcl: handle files with % in the filename properly
Steps to reproduce the bug: $ mkdir repo && cd repo && git init Initialized empty Git repository in .git/ $ touch 'foo%3Fsuite' $ git-gui Then click on the 'foo%3Fsuite' icon to include it in a changeset, a popup comes with: 'Error: bad field specifier "F"' Vincent Danjean noticed the problem and also suggested the fix, reported through http://bugs.debian.org/441167 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/index.tcl18
1 files changed, 12 insertions, 6 deletions
diff --git a/lib/index.tcl b/lib/index.tcl
index f47f929..cbbce13 100644
--- a/lib/index.tcl
+++ b/lib/index.tcl
@@ -13,7 +13,8 @@ proc update_indexinfo {msg pathList after} {
if {$batch > 25} {set batch 25}
ui_status [format \
- "$msg... %i/%i files (%.2f%%)" \
+ "%s... %i/%i files (%.2f%%)" \
+ $msg \
$update_index_cp \
$totalCnt \
0.0]
@@ -68,7 +69,8 @@ proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
}
ui_status [format \
- "$msg... %i/%i files (%.2f%%)" \
+ "%s... %i/%i files (%.2f%%)" \
+ $msg \
$update_index_cp \
$totalCnt \
[expr {100.0 * $update_index_cp / $totalCnt}]]
@@ -86,7 +88,8 @@ proc update_index {msg pathList after} {
if {$batch > 25} {set batch 25}
ui_status [format \
- "$msg... %i/%i files (%.2f%%)" \
+ "%s... %i/%i files (%.2f%%)" \
+ $msg \
$update_index_cp \
$totalCnt \
0.0]
@@ -145,7 +148,8 @@ proc write_update_index {fd pathList totalCnt batch msg after} {
}
ui_status [format \
- "$msg... %i/%i files (%.2f%%)" \
+ "%s... %i/%i files (%.2f%%)" \
+ $msg \
$update_index_cp \
$totalCnt \
[expr {100.0 * $update_index_cp / $totalCnt}]]
@@ -163,7 +167,8 @@ proc checkout_index {msg pathList after} {
if {$batch > 25} {set batch 25}
ui_status [format \
- "$msg... %i/%i files (%.2f%%)" \
+ "%s... %i/%i files (%.2f%%)" \
+ $msg
$update_index_cp \
$totalCnt \
0.0]
@@ -218,7 +223,8 @@ proc write_checkout_index {fd pathList totalCnt batch msg after} {
}
ui_status [format \
- "$msg... %i/%i files (%.2f%%)" \
+ "%s... %i/%i files (%.2f%%)" \
+ $msg \
$update_index_cp \
$totalCnt \
[expr {100.0 * $update_index_cp / $totalCnt}]]