зеркало из https://github.com/microsoft/git.git
git-gui: Protect ourselves from funny GIT_DIR/working directory setups.
Since we have some serious problems with the GIT_DIR environment variable on Windows we cannot let the user use a non-standard GIT_DIR with their working directory. So require that the GIT_DIR name is actually ".git", that it exists, and that its parent directory is our working directory. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Родитель
4aca740b39
Коммит
dbccbbda4f
14
git-gui
14
git-gui
|
@ -167,6 +167,16 @@ if { [catch {set gitdir $env(GIT_DIR)}]
|
|||
error_popup "Cannot find the git directory:\n\n$err"
|
||||
exit 1
|
||||
}
|
||||
if {![file isdirectory $gitdir]} {
|
||||
catch {wm withdraw .}
|
||||
error_popup "Git directory not found:\n\n$gitdir"
|
||||
exit 1
|
||||
}
|
||||
if {[lindex [file split $gitdir] end] ne {.git}} {
|
||||
catch {wm withdraw .}
|
||||
error_popup "Cannot use funny .git directory:\n\n$gitdir"
|
||||
exit 1
|
||||
}
|
||||
if {[catch {cd [file dirname $gitdir]} err]} {
|
||||
catch {wm withdraw .}
|
||||
error_popup "No working directory [file dirname $gitdir]:\n\n$err"
|
||||
|
@ -2040,8 +2050,8 @@ proc do_windows_shortcut {} {
|
|||
--absolute \
|
||||
$gitdir]
|
||||
puts -nonewline $fd "\"$sh\" --login -c \""
|
||||
puts -nonewline $fd "GIT_DIR=\\\"$gd\\\""
|
||||
puts -nonewline $fd " \\\"$me\\\""
|
||||
puts -nonewline $fd "GIT_DIR='$gd'"
|
||||
puts -nonewline $fd " '$me'"
|
||||
puts $fd "&\""
|
||||
close $fd
|
||||
} err]} {
|
||||
|
|
Загрузка…
Ссылка в новой задаче