aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2008-07-21 20:13:01 -0230
committerGuido Guenther <agx@sigxcpu.org>2008-07-21 20:13:01 -0230
commit18d840579dacb0a9d6890daa9fb0b621b128753e (patch)
tree8020d8e0edbe9c58c0dbccc1f0fc3537586bc1c4
parent4ac0aa8af83ee090cfb7526d27e4b70ce9cb96d9 (diff)
split git-log options into a list
allows to pass multiple arguments to git-log Closes: #479267
-rw-r--r--gbp/git_utils.py6
-rwxr-xr-xgit-dch2
2 files changed, 4 insertions, 4 deletions
diff --git a/gbp/git_utils.py b/gbp/git_utils.py
index 5f6158c6..13845d56 100644
--- a/gbp/git_utils.py
+++ b/gbp/git_utils.py
@@ -96,9 +96,9 @@ class GitRepository(object):
def commits(self, start, end, paths, options):
"""get commits from start to end touching pathds"""
- commits, ret = self.__git_getoutput('log', ['--pretty=format:%H',
- options, '%s..%s' % (start, end),
- '--', paths])
+ commits, ret = self.__git_getoutput('log',
+ ['--pretty=format:%H'] + options +
+ ['%s..%s' % (start, end), '--', paths])
if ret:
raise GitRepositoryError, "Error getting commits %s..%s%s" % (start, end, ["", " on %s" % paths][len(paths) > 0] )
return [ commit.strip() for commit in commits ]
diff --git a/git-dch b/git-dch
index 0ef397f4..d0dad92b 100755
--- a/git-dch
+++ b/git-dch
@@ -288,7 +288,7 @@ def main(argv):
if args:
print "Only looking for changes on '%s'" % " ".join(args)
- commits = repo.commits(since, until, " ".join(args), options.git_log)
+ commits = repo.commits(since, until, " ".join(args), options.git_log.split(" "))
if commits:
if cp['Distribution'] != "UNRELEASED" and not found_snapshot_header:
add_changelog_section(distribution="UNRELEASED", msg="UNRELEASED")