diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | git-import-orig | 15 |
2 files changed, 11 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 39995845..944a5bad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ git-buildpackage (0.2.8) git-buildpackage; urgency=low * minor cosmetic cleanups all over the place * README: no need to mention git-load-dirs anymore, it's in unstable now. Thanks John. + * git-import-orig: implement "--no-merge" - -- Guido Guenther <agx@sigxcpu.org> Fri, 3 Nov 2006 17:21:12 +0100 + -- Guido Guenther <agx@sigxcpu.org> Wed, 8 Nov 2006 10:36:55 +0100 git-buildpackage (0.2.7) git-buildpackage; urgency=low diff --git a/git-import-orig b/git-import-orig index c085e08b..9fae9131 100755 --- a/git-import-orig +++ b/git-import-orig @@ -60,6 +60,8 @@ def main(): help="name of the upstream branch, default is 'upstream'") parser.add_option("--debian-branch", dest='debian', default='master', help="name of the branch the debian package is being developed on, default is 'master'") + parser.add_option("--no-merge", dest='merge', action="store_false", default=True, + help="after import dont do any merging to another branch") (options, args) = parser.parse_args() gitCheckoutUpstream=GitCheckoutBranch(options.upstream) @@ -110,12 +112,13 @@ def main(): gitShowBranch() GitLoadDirs()(origdir) GitTag()(sanitize_version(version)) - - print "Merging to master..." - gitCheckoutMaster() - gitShowBranch() - gitPullUpstream() - Dch("%s-1" % (version,), 'New Upstream Version')() + + if options.merge: + print "Merging to master..." + gitCheckoutMaster() + gitShowBranch() + gitPullUpstream() + Dch("%s-1" % (version,), 'New Upstream Version')() except CommandExecFailed: print >>sys.stderr, "Import of %s failed" % (tgz,) cleanupTmpTree(tmpdir) |