diff options
| author | Guido Günther <agx@sigxcpu.org> | 2016-12-28 19:54:25 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2016-12-28 19:54:25 +0100 |
| commit | 1ac2724f50e3a4ad3d4163e771ce1a3294c22cc5 (patch) | |
| tree | ddeef80600969c80c67108a99a556080b48fb4a3 | |
| parent | 3b1b9bc6e72480e5ddeb180b1ae0e557c122fa9b (diff) | |
GitRepository.commit_dir: add a proper reflog entry
otherwise 'gbp import-dsc' adds reflog entries without a description.
| -rw-r--r-- | gbp/git/repository.py | 3 | ||||
| -rw-r--r-- | tests/component/deb/test_import_dsc.py | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gbp/git/repository.py b/gbp/git/repository.py index 795d285d..3ccc38a0 100644 --- a/gbp/git/repository.py +++ b/gbp/git/repository.py @@ -1488,7 +1488,8 @@ class GitRepository(object): author=author, committer=committer) if not commit: raise GitRepositoryError("Failed to commit tree") - self.update_ref("refs/heads/%s" % branch, commit, cur) + self.update_ref("refs/heads/%s" % branch, commit, cur, + msg="gbp: %s" % msg) return commit def commit_tree(self, tree, msg, parents, author={}, committer={}): diff --git a/tests/component/deb/test_import_dsc.py b/tests/component/deb/test_import_dsc.py index a0d790c9..3d9e1bcd 100644 --- a/tests/component/deb/test_import_dsc.py +++ b/tests/component/deb/test_import_dsc.py @@ -101,6 +101,9 @@ class TestImportDsc(ComponentTestBase): repo = ComponentTestGitRepository('hello-debhelper') os.chdir('hello-debhelper') assert len(repo.get_commits()) == 2 + reflog, ret = repo._git_getoutput('reflog') + ok_("gbp: Import Debian patch" in reflog[1]) + ok_("gbp: Import Upstream version 2.6" in reflog[2]) self._check_repo_state(repo, 'master', ['master', 'pristine-tar', 'upstream']) dsc = _dsc('2.8-1') assert import_dsc(['arg0', |