diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-06-11 00:52:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-11 00:52:43 -0700 |
| commit | 75d8ff138dd640a117c6aaa625d0f6b835adbd3a (patch) | |
| tree | 3fe3467ed5b90dfef595a324a7134cb2b6f192ef /git-gui/lib/transport.tcl | |
| parent | 27c1dbea3e3a23b3c4b3707dfc9a71c3279ae279 (diff) | |
| parent | 32af629ab57869f96f282e7f7839e84d1b8e22ca (diff) | |
| download | git-75d8ff138dd640a117c6aaa625d0f6b835adbd3a.tar.gz git-75d8ff138dd640a117c6aaa625d0f6b835adbd3a.tar.xz | |
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui:
git-gui: Internalize symbolic-ref HEAD reading logic
git-gui: Expose the merge.diffstat configuration option
git-gui: Allow users to delete remote branches
git-gui: Allow users to rename branches through 'branch -m'
git-gui: Disable tearoff menus on Windows, Mac OS X
git-gui: Provide fatal error if library is unavailable
git-gui: Enable verbose Tcl loading earlier
git-gui: Show the git-gui library path in 'About git-gui'
git-gui: GUI support for running 'git remote prune <name>'
git gui 0.8.0
Diffstat (limited to 'git-gui/lib/transport.tcl')
| -rw-r--r-- | git-gui/lib/transport.tcl | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/git-gui/lib/transport.tcl b/git-gui/lib/transport.tcl index c0e7d20fc..e8ebc6eda 100644 --- a/git-gui/lib/transport.tcl +++ b/git-gui/lib/transport.tcl @@ -5,9 +5,19 @@ proc fetch_from {remote} { set w [console::new \ "fetch $remote" \ "Fetching new changes from $remote"] - set cmd [list git fetch] - lappend cmd $remote - console::exec $w $cmd + set cmds [list] + lappend cmds [list exec git fetch $remote] + if {[is_config_true gui.pruneduringfetch]} { + lappend cmds [list exec git remote prune $remote] + } + console::chain $w $cmds +} + +proc prune_from {remote} { + set w [console::new \ + "remote prune $remote" \ + "Pruning tracking branches deleted from $remote"] + console::exec $w [list git remote prune $remote] } proc push_to {remote} { |