diff options
| author | Adeodato Simó <dato@net.com.org.es> | 2008-06-13 23:25:27 +0200 |
|---|---|---|
| committer | Guido Guenther <agx@sigxcpu.org> | 2008-06-24 18:45:13 +0200 |
| commit | 35c92a4508cf93c8ff6c454b7074211047a36e6d (patch) | |
| tree | ebe52bf6e8b95dfdc8a2e73f626a00773a5d916e | |
| parent | f1ca0440080ceb484c44fa265c340b13699f6458 (diff) | |
git-import-orig: merge upstream by tag name instead of by branch name.
This produces more useful commit messages, where you know what upstream
version was merged by just looking at the log in "master".
| -rwxr-xr-x | git-import-orig | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/git-import-orig b/git-import-orig index b7dd499d..6774a44c 100755 --- a/git-import-orig +++ b/git-import-orig @@ -126,7 +126,6 @@ def main(argv): gitCheckoutMaster = gbpc.GitCheckoutBranch(options.debian_branch) gitShowBranch = gbpc.GitShowBranch() - gitPullUpstream = gbpc.GitPull('.', options.upstream_branch) try: if len(args) != 1: @@ -206,8 +205,8 @@ on howto create it otherwise use --upstream-branch to specify it. gbpc.PristineTar().commit(pristine_orig, 'refs/heads/%s' % upstream_branch) else: print >>sys.stderr, "Warning: '%s' not an archive, skipping pristine-tar" % archive - gbpc.GitTag(options.sign_tags, options.keyid)(build_tag(options.upstream_tag, version), - msg="Upstream version %s" % version) + tag = build_tag(options.upstream_tag, version) + gbpc.GitTag(options.sign_tags, options.keyid)(tag, msg="Upstream version %s" % version) if is_empty: gbpc.GitBranch()(options.upstream_branch) @@ -216,7 +215,7 @@ on howto create it otherwise use --upstream-branch to specify it. gitCheckoutMaster() gitShowBranch() try: - gitPullUpstream() + gbpc.GitMerge(tag)() except gbpc.CommandExecFailed: raise GbpError, """Merge failed, please resolve and run "dch -v %s-1".""" % version if not options.no_dch: |