[kgb-maintainers] Bug#698133: Bug#698133: kgb-client: Should not resend the whole history when pushing branches with content merged from other branches

[Damyan Ivanov]

Control: -1 tags confirmed help

-=| Raphaël Hertzog, 14.01.2013 11:04:39 +0100 |=-
> Package: kgb-client
> Version: 1.05-1+squeeze1
> Severity: normal
> 
> In the dpkg repository, we have multiple branches. I maintain the
> squeeze-backports branch... most of the commits in that branch are
> just commits merged from master. Those commits should not be reported...
> we already saw them. Instead it should just report the merge commit
> and commits specific to that branch.
> 
> The basic rule is "any commit that is already present in another branch
> should not be reported".

Unless both branches are being pushed in which case we lose the commit 
as it is always present in another branch at the time the hook is 
invoked.

> It's not to difficult to implement. git-commit-notice on alioth 
> already has some logic to prevent this in the "report by mail" case. 
> You can check it out if you want.

My attempts are towards reworking the current logic by using 
git-rev-list, which avoids reporting commits twice nicely. The hard 
thing seems to be tracking which branch each commit was made to.

Even if I haven't lost all hope to fix this myself, this hasn't 
happened during months already, so help is very welcome.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/kgb-maintainers/attachments/20130114/33ece417/attachment.pgp>