[Buildbot] #3292: GitPoller can't get changed files on merge commit
Buildbot trac
trac at buildbot.net
Fri Jun 26 06:41:25 UTC 2015
#3292: GitPoller can't get changed files on merge commit
----------------------+------------------------
Reporter: boolking | Owner:
Type: undecided | Status: new
Priority: major | Milestone: undecided
Version: 0.8.12 | Resolution:
Keywords: |
----------------------+------------------------
Description changed by sa2ajj:
Old description:
> _get_commit_files in gitpoller.py use git-log command to get changed file
> of a commit:
>
> def _get_commit_files(self, rev):
> args = ['--name-only', '--no-walk', r'--format=%n', rev, '--']
>
> But when a commit is a merge commit, this command won't get any file.
> Following patch will fix it:
>
> def _get_commit_files(self, rev):
> args = ['--name-only', '--no-walk', r'--format=%n', '-first-parent',
> '-m', rev, '--']
New description:
_get_commit_files in gitpoller.py use git-log command to get changed file
of a commit:
{{{
def _get_commit_files(self, rev):
args = ['--name-only', '--no-walk', r'--format=%n', rev, '--']
}}}
But when a commit is a merge commit, this command won't get any file.
Following patch will fix it:
{{{
def _get_commit_files(self, rev):
args = ['--name-only', '--no-walk', r'--format=%n', '-first-parent',
'-m', rev, '--']
}}}
--
--
Ticket URL: <http://trac.buildbot.net/ticket/3292#comment:1>
Buildbot <http://buildbot.net/>
Buildbot: build/test automation
More information about the bugs
mailing list