chiark / gitweb /
Merge branch 'fixes/independent-help' into refs/top-bases/i/basis-merge
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 28 Dec 2011 01:55:46 +0000 (01:55 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 28 Dec 2011 01:55:46 +0000 (01:55 +0000)
Conflicts:
tg.sh

1  2 
tg.sh

diff --cc tg.sh
--- 1/tg.sh
--- 2/tg.sh
+++ b/tg.sh
@@@ -441,8 -450,9 +464,11 @@@ get_temp(
  [ -d "@cmddir@" ] ||
        die "No command directory: '@cmddir@'"
  
+ # check if we should run help and get the topic while we're at it
+ help_topic="$(should_do_help "$@")" && { do_help "$help_topic"; exit 0; }
 +ensure_git_repo_or_die
 +
  ## Initial setup
  
  set -e