diff options
author | Guido Guenther <agx@sigxcpu.org> | 2007-11-04 15:28:51 +0100 |
---|---|---|
committer | Guido Guenther <agx@sigxcpu.org> | 2007-11-05 19:55:27 +0100 |
commit | d17637ea18415c56b0d91cfdacd1f0f451154beb (patch) | |
tree | 6c92e8597582359a8a5c07ea47466882c4ab7214 /git-import-orig | |
parent | 55884f09968c469040b6e4fa8c4df6bb086a8658 (diff) |
don't print a commit summary when importing into empty repos (addresses parts of #449075)
Diffstat (limited to 'git-import-orig')
-rwxr-xr-x | git-import-orig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-import-orig b/git-import-orig index 145bc34a..284bf0dc 100755 --- a/git-import-orig +++ b/git-import-orig @@ -50,7 +50,7 @@ def unpack_orig(archive, tmpdir): return unpackArchive.dir -def import_source_tree(repo, orig_dir, version, filter): +def import_source_tree(repo, orig_dir, version, filter, verbose): """import source tree to the current branch""" try: old = set(repo.index_files()) @@ -60,7 +60,7 @@ def import_source_tree(repo, orig_dir, version, filter): if files: gbpc.GitRm()(files) if not repo.is_clean()[0]: - gbpc.GitCommitAll()(msg="Imported upstream version %s" % version) + gbpc.GitCommitAll(verbose=verbose)(msg="Imported upstream version %s" % version) else: raise GbpError, "Nothing to commit, nothing imported." except gbpc.CommandExecFailed: @@ -178,7 +178,7 @@ create it otherwise use --upstream-branch to specify it. else: print "Initial import of '%s'..." % archive - import_source_tree(repo, orig_dir, version, options.filter) + import_source_tree(repo, orig_dir, version, options.filter, verbose=not is_empty) gbpc.GitTag(options.sign_tags, options.keyid)(build_tag(options.upstream_tag, version), msg="Upstream version %s" % version) |