git-gui: Refactor to use our git proc more often

Whenever we want to execute a git subcommand from the plumbing
layer (and on rare occasion, the more porcelain-ish layer) we
tend to use our proc wrapper, just to make the code slightly
cleaner at the call sites.  I wasn't doing that in a couple of
places, so this is a simple cleanup to correct that.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce
2007-04-29 01:54:57 -04:00
parent 7416bbc65c
commit dc6716b83d

View File

@ -1298,12 +1298,12 @@ A rescan will be automatically started now.
# -- Create the commit. # -- Create the commit.
# #
set cmd [list git commit-tree $tree_id] set cmd [list commit-tree $tree_id]
foreach p [concat $PARENT $MERGE_HEAD] { foreach p [concat $PARENT $MERGE_HEAD] {
lappend cmd -p $p lappend cmd -p $p
} }
lappend cmd <$msg_p lappend cmd <$msg_p
if {[catch {set cmt_id [eval exec $cmd]} err]} { if {[catch {set cmt_id [eval git $cmd]} err]} {
error_popup "commit-tree failed:\n\n$err" error_popup "commit-tree failed:\n\n$err"
set ui_status_value {Commit failed.} set ui_status_value {Commit failed.}
unlock_index unlock_index
@ -1323,8 +1323,9 @@ A rescan will be automatically started now.
set subject $msg set subject $msg
} }
append reflogm {: } $subject append reflogm {: } $subject
set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD] if {[catch {
if {[catch {eval exec $cmd} err]} { git update-ref -m $reflogm HEAD $cmt_id $curHEAD
} err]} {
error_popup "update-ref failed:\n\n$err" error_popup "update-ref failed:\n\n$err"
set ui_status_value {Commit failed.} set ui_status_value {Commit failed.}
unlock_index unlock_index
@ -2018,13 +2019,13 @@ proc do_create_branch_action {w} {
-message "Invalid starting revision: $rev" -message "Invalid starting revision: $rev"
return return
} }
set cmd [list git update-ref] if {[catch {
lappend cmd -m git update-ref \
lappend cmd "branch: Created from $rev" -m "branch: Created from $rev" \
lappend cmd "refs/heads/$newbranch" "refs/heads/$newbranch" \
lappend cmd $cmt $cmt \
lappend cmd $null_sha1 $null_sha1
if {[catch {eval exec $cmd} err]} { } err]} {
tk_messageBox \ tk_messageBox \
-icon error \ -icon error \
-type ok \ -type ok \