summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-24 08:39:01 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-24 08:39:01 (GMT)
commita549e11cc2fee10ddf66dd98ea79f7c624eee34e (patch)
tree6be0208ec8553296a78b595348c9c78c8f2aad13
parente64961b0573b0e72bd55eab6d36bd97f859f9516 (diff)
parent61e56c8823afd2c5a753a4969330ead0ba850c66 (diff)
downloadgit-a549e11cc2fee10ddf66dd98ea79f7c624eee34e.zip
git-a549e11cc2fee10ddf66dd98ea79f7c624eee34e.tar.gz
git-a549e11cc2fee10ddf66dd98ea79f7c624eee34e.tar.bz2
Merge git://git.kernel.org/pub/scm/gitk/gitk
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Let git-rev-list do the argument list parsing
-rwxr-xr-xgitk20
1 files changed, 2 insertions, 18 deletions
diff --git a/gitk b/gitk
index 87e7162..5362b76 100755
--- a/gitk
+++ b/gitk
@@ -16,22 +16,6 @@ proc gitdir {} {
}
}
-proc parse_args {rargs} {
- global parsed_args
-
- if {[catch {
- set parse_args [concat --default HEAD $rargs]
- set parsed_args [split [eval exec git-rev-parse $parse_args] "\n"]
- }]} {
- # if git-rev-parse failed for some reason...
- if {$rargs == {}} {
- set rargs HEAD
- }
- set parsed_args $rargs
- }
- return $parsed_args
-}
-
proc start_rev_list {rlargs} {
global startmsecs nextupdate ncmupdate
global commfd leftover tclencoding datemode
@@ -46,7 +30,7 @@ proc start_rev_list {rlargs} {
}
if {[catch {
set commfd [open [concat | git-rev-list --header $order \
- --parents --boundary $rlargs] r]
+ --parents --boundary --default HEAD $rlargs] r]
} err]} {
puts stderr "Error executing git-rev-list: $err"
exit 1
@@ -65,7 +49,7 @@ proc getcommits {rargs} {
global phase canv mainfont
set phase getcommits
- start_rev_list [parse_args $rargs]
+ start_rev_list $rargs
$canv delete all
$canv create text 3 3 -anchor nw -text "Reading commits..." \
-font $mainfont -tags textitems