diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-08-07 18:19:09 -0300 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-08-07 18:24:56 -0300 |
| commit | f208a0bcba865672838fe34c9a84bac4f4764a4c (patch) | |
| tree | a1d75f11aafb5b5fae374a904614faee4d4853b4 /gbp/scripts/import_orig.py | |
| parent | 01a4a7fe91b8fb7193a1344409855c4f61e1f880 (diff) | |
import_orig: use a more gittish commit message
When replacing the debian/ dir don't used past tense and
keep the subject more like git-merge.
Closes: #867214
Diffstat (limited to 'gbp/scripts/import_orig.py')
| -rw-r--r-- | gbp/scripts/import_orig.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py index 3580cd29..9ee1c985 100644 --- a/gbp/scripts/import_orig.py +++ b/gbp/scripts/import_orig.py @@ -366,7 +366,7 @@ def debian_branch_merge_by_replace(repo, tag, version, options): tree = [x for x in repo.list_tree("%s^{tree}" % tag) if x[-1] != 'debian'] - msg = "Updated version %s from '%s'" % (version, tag) + msg = "Update upstream source from tag '%s'" % (tag) # Get the current debian/ tree on the debian branch try: @@ -374,7 +374,7 @@ def debian_branch_merge_by_replace(repo, tag, version, options): if x[-1] == b'debian' and x[1] == 'tree'][0][2] gbp.log.debug("Using %s as debian/ tree" % deb_sha) tree.append(['040000', 'tree', deb_sha, 'debian']) - msg += "\n\nwith Debian dir %s" % deb_sha + msg += "\n\nUpdate to upstream version '%s'\nwith Debian dir %s" % (version, deb_sha) except IndexError: pass # no debian/ dir is fine |