diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-07-06 08:03:24 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-07-06 08:03:24 (GMT) |
| commit | f8186e92e3399ddd742f2397e802467cabf2849f (patch) | |
| tree | 161205087594eacf3de71afcc1a003077375c09e /lib | |
| parent | 1eb96a25c9e76b70ca3f335bce7e60d66220eaa9 (diff) | |
| parent | 47282d4646372aa859908c3b9471b96c385abe5f (diff) | |
| download | git-f8186e92e3399ddd742f2397e802467cabf2849f.zip git-f8186e92e3399ddd742f2397e802467cabf2849f.tar.gz git-f8186e92e3399ddd742f2397e802467cabf2849f.tar.bz2 | |
Merge branch 'maint'
* maint:
git-gui: Ensure windows shortcuts always have .bat extension
git-gui: Include a Push action on the left toolbar
git-gui: Bind M1-P to push action
git-gui: Don't bind F5/M1-R in all windows
Conflicts:
git-gui.sh
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/shortcut.tcl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/shortcut.tcl b/lib/shortcut.tcl index ebf72e4..a0a1b7d 100644 --- a/lib/shortcut.tcl +++ b/lib/shortcut.tcl @@ -9,6 +9,9 @@ proc do_windows_shortcut {} { -title "[appname] ([reponame]): Create Desktop Icon" \ -initialfile "Git [reponame].bat"] if {$fn != {}} { + if {[file extension $fn] ne {.bat}} { + set fn ${fn}.bat + } if {[catch { set fd [open $fn w] puts $fd "@ECHO Entering [reponame]" @@ -42,6 +45,9 @@ proc do_cygwin_shortcut {} { -initialdir $desktop \ -initialfile "Git [reponame].bat"] if {$fn != {}} { + if {[file extension $fn] ne {.bat}} { + set fn ${fn}.bat + } if {[catch { set fd [open $fn w] set sh [exec cygpath \ |