diff options
author | Matthijs Kooijman <matthijs@stdin.nl> | 2010-08-19 12:33:02 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2010-09-17 20:07:16 +0200 |
commit | ee0e9ffe0a69d1ae1080f8087725015ae0ff8bc4 (patch) | |
tree | caf48559cc9cc07b7d201a381e39ae9adc3ff48f /git-dch | |
parent | 083834b407e2e76e1386f9004e495a88f2906cf4 (diff) |
Let git-import-orig find the changelog when not on the debian-branch.
When no changelog file is available in the checkout, look for the
changelog in the repository. This allows for using git-import-orig when
the upstream branch is checked out, for example.
Diffstat (limited to 'git-dch')
-rwxr-xr-x | git-dch | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -232,7 +232,7 @@ def do_snapshot(changelog, repo, next_snapshot): """ commit = head_commit(repo) - cp = parse_changelog(changelog) + cp = parse_changelog(filename=changelog) (release, snapshot) = snapshot_version(cp['Version']) snapshot = int(eval(next_snapshot)) @@ -417,7 +417,7 @@ def main(argv): print >>sys.stderr, "You are not on branch '%s' but on '%s'" % (options.debian_branch, branch) raise GbpError, "Use --ignore-branch to ignore or --debian-branch to set the branch name." - cp = parse_changelog(changelog) + cp = parse_changelog(filename=changelog) if options.since: since = options.since |