global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-01 12:30:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'devel' into work/1.7.0.2

Browse Source
This commit is contained in:
Johannes Schindelin
2010-03-08 12:04:54 +01:00
parent b38a696841 ef6aded563
commit dd1811f827
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-gui/lib/shortcut.tcl
View File

@@ -16,7 +16,7 @@ proc do_windows_shortcut {} {
[info nameofexecutable] \
[file normalize $::argv0] \
] \
[file normalize [$_gitworktree]]
[file normalize $_gitworktree]
} err]} {
error_popup [strcat [mc "Cannot write shortcut:"] "\n\n$err"]
}
@@ -57,7 +57,7 @@ proc do_cygwin_shortcut {} {
$sh -c \
"CHERE_INVOKING=1 source /etc/profile;[sq $me] &" \
] \
[file normalize [$_gitworktree]]
[file normalize $_gitworktree]
} err]} {
error_popup [strcat [mc "Cannot write shortcut:"] "\n\n$err"]
}

4
git-gui/lib/win32.tcl
View File

@@ -18,9 +18,9 @@ proc win32_create_lnk {lnk_path lnk_exec lnk_dir} {
eval [list exec wscript.exe \
/E:jscript \
/nologo \
[file join $oguilib win32_shortcut.js] \
[file nativename [file join $oguilib win32_shortcut.js]] \
$lnk_path \
[file join $oguilib git-gui.ico] \
[file nativename [file join $oguilib git-gui.ico]] \
$lnk_dir \
$lnk_exec] $lnk_args
}

5
git-gui/windows/git-gui.sh
View File

@@ -13,10 +13,11 @@ if { $argc >=2 && [lindex $argv 0] == "--working-dir" } {
incr argc -2
}
set bindir [file dirname \
set basedir [file dirname \
[file dirname \
[file dirname [info script]]]]
set bindir [file join $bindir bin]
set bindir [file join $basedir bin]
set bindir "$bindir;[file join $basedir mingw bin]"
regsub -all ";" $bindir "\\;" bindir
set env(PATH) "$bindir;$env(PATH)"
unset bindir