mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitk: Run 'git rev-parse --git-dir' only once

Browse Source 
It seems like gitk has been setting the global variable 'gitdir' at
startup since aa81d97 (gitk: Fix Update menu item, 2006-02-28).  It
should therefore no longer be necessary to call the procedure with the
same name (more than once to set the global variable).  Remove the
other call sites and use the global variable instead.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Martin von Zweigbergk
2011-04-04 22:14:17 -04:00
committed by Paul Mackerras
parent 929f577e0a
commit da616db5e5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gitk
View File

@ -9059,6 +9059,7 @@ proc exec_citool {tool_args {baseid {}}} {
proc cherrypick {} { proc cherrypick {} {
global rowmenuid curview global rowmenuid curview
global mainhead mainheadid global mainhead mainheadid
global gitdir
set oldhead [exec git rev-parse HEAD] set oldhead [exec git rev-parse HEAD]
set dheads [descheads $rowmenuid] set dheads [descheads $rowmenuid]
@ -9087,7 +9088,7 @@ proc cherrypick {} {
conflict.\nDo you wish to run git citool to\ conflict.\nDo you wish to run git citool to\
resolve it?"]]} { resolve it?"]]} {
# Force citool to read MERGE_MSG # Force citool to read MERGE_MSG
file delete [file join [gitdir] "GITGUI_MSG"] file delete [file join $gitdir "GITGUI_MSG"]
exec_citool {} $rowmenuid exec_citool {} $rowmenuid
} }
} else { } else {
@ -9453,6 +9454,7 @@ proc refill_reflist {} {
proc getallcommits {} { proc getallcommits {} {
global allcommits nextarc seeds allccache allcwait cachedarcs allcupdate global allcommits nextarc seeds allccache allcwait cachedarcs allcupdate
global idheads idtags idotherrefs allparents tagobjid global idheads idtags idotherrefs allparents tagobjid
global gitdir
if {![info exists allcommits]} { if {![info exists allcommits]} {
set nextarc 0 set nextarc 0
@ -9460,7 +9462,7 @@ proc getallcommits {} {
set seeds {} set seeds {}
set allcwait 0 set allcwait 0
set cachedarcs 0 set cachedarcs 0
set allccache [file join [gitdir] "gitk.cache"] set allccache [file join $gitdir "gitk.cache"]
if {![catch { if {![catch {
set f [open $allccache r] set f [open $allccache r]
set allcwait 1 set allcwait 1