Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  [PATCH] Make gitk work when launched in a subdirectory
  [PATCH] gitk: add current directory to main window title
This commit is contained in:
Junio C Hamano 2007-01-14 23:43:47 -08:00
commit 38ebbacd93

3
gitk
View File

@ -12,7 +12,7 @@ proc gitdir {} {
if {[info exists env(GIT_DIR)]} { if {[info exists env(GIT_DIR)]} {
return $env(GIT_DIR) return $env(GIT_DIR)
} else { } else {
return ".git" return [exec git rev-parse --git-dir]
} }
} }
@ -6293,6 +6293,7 @@ set stuffsaved 0
set patchnum 0 set patchnum 0
setcoords setcoords
makewindow makewindow
wm title . "[file tail $argv0]: [file tail [pwd]]"
readrefs readrefs
if {$cmdline_files ne {} || $revtreeargs ne {}} { if {$cmdline_files ne {} || $revtreeargs ne {}} {