mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-05 08:47:56 +01:00
Code Activity

gitk: Fix handling of flag arguments

Browse source 
Despite the name, the --revs-only flag to git rev-parse doesn't make
it output only revision IDs.  It makes it output only arguments that
are suitable for giving to git rev-list.  So make start_rev_list and
updatecommits cope with arguments output by git rev-parse that aren't
revision IDs.  This way we won't get an error when an argument such as
"-300" has been given to gitk and the view is updated.

Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras 2008-01-10 21:44:39 +11:00
parent 6636b88ea1
commit 5be25a8f85
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gitk
View file

@ -110,7 +110,7 @@ proc start_rev_list {view} {
$viewargs($view)]
set viewincl($view) {}
foreach c $commits {
if {![string match "^*" $c]} {
if {[regexp {^[0-9a-fA-F]{40}$} $c]} {
lappend viewincl($view) $c
}
}
@ -187,14 +187,17 @@ proc updatecommits {} {
$viewargs($view)]
set pos {}
set neg {}
set flags {}
foreach c $commits {
if {[string match "^*" $c]} {
lappend neg $c
} else {
} elseif {[regexp {^[0-9a-fA-F]{40}$} $c]} {
if {!([info exists varcid($view,$c)] ||
[lsearch -exact $viewincl($view) $c] >= 0)} {
lappend pos $c
}
} else {
lappend flags $c
}
}
if {$pos eq {}} {
@ -206,7 +209,7 @@ proc updatecommits {} {
set viewincl($view) [concat $viewincl($view) $pos]
if {[catch {
set fd [open [concat | git log --no-color -z --pretty=raw --parents \
--boundary $pos $neg "--" $viewfiles($view)] r]
--boundary $pos $neg $flags "--" $viewfiles($view)] r]
} err]} {
error_popup "Error executing git log: $err"
exit 1