summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen W. Taylor <otaylor@fishsoup.net>2008-11-16 08:58:50 -0500
committerOwen W. Taylor <otaylor@fishsoup.net>2008-11-16 09:01:25 -0500
commit88e0e6925e54f45227da5c09c38f3b217a1e1b85 (patch)
tree54a5d053f7c1f4682c8e56d08c0ae5759afbdebd
parent6db9ba155f8b1b32734c20619663ab92efeebdd4 (diff)
Fix a couple of minor problems introduced in cleanup
Testing revealed a couple of invalid variable references from cleanups just before the initial import. Fix.
-rwxr-xr-xgit-bz7
1 files changed, 4 insertions, 3 deletions
diff --git a/git-bz b/git-bz
index c9f90ee..5057b93 100755
--- a/git-bz
+++ b/git-bz
@@ -190,7 +190,7 @@ global_options = None
def get_commits(since_or_revision_range):
if global_options.num:
- commits = git.Commit.find_all(repo, since_or_revision_range, max_count=global_options.num)
+ commits = git.Commit.find_all(global_repo, since_or_revision_range, max_count=global_options.num)
else:
# git format-patch has special handling of specifying a single revision that is
# different than git-rev-list. Match that.
@@ -202,7 +202,7 @@ def get_commits(since_or_revision_range):
# If not, assume the argument is a range
revision_range = since_or_revision_range
- commits = git.Commit.find_all(repo, revision_range)
+ commits = git.Commit.find_all(global_repo, revision_range)
if len(commits) == 0:
die("'%s' does not name any commits. Use HEAD^ to specify just the last commit" %
@@ -277,6 +277,7 @@ cached_config_tracker = None
def get_config(tracker):
global cached_config
+ global cached_config_tracker
if cached_config == None:
cached_config_tracker = tracker
@@ -737,7 +738,7 @@ else:
print >>sys.stderr, "Usage: git bz [apply|attach|file] [options]"
sys.exit(1)
-options, args = parser.parse_args()
+global_options, args = parser.parse_args()
if len(args) != n_args:
parser.print_usage()