summaryrefslogtreecommitdiffstats
path: root/build-aux
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2010-07-02 13:28:35 (GMT)
committerHolger Weiss <holger@zedat.fu-berlin.de>2010-07-02 13:28:35 (GMT)
commit319e308521e0e460fe0b06ee093248628dda819d (patch)
treedf123d8a40351d3770dce4a02dfa15cd0a30d78f /build-aux
parent5c72d075deb12239e2f1c61cf7b91e0f6ef19640 (diff)
downloadmonitoring-plugins-319e308521e0e460fe0b06ee093248628dda819d.tar.gz
git-notify: Be careful with "--no-merge"
The "-X" option (which asks git-notify to not report merge commits) was implemented by setting the "--no-merge" option on each invocation of git-rev-list(1). However, we do not only use git-rev-list(1) to get the list of new commits, but also to check whether the old branch head (or tag) is a parent of the new branch head (or tag). For this latter check, the "--no-merge" option should not be set; otherwise, git-notify would be fooled to believe that the branch has been rewritten if the old head was a merge commit.
Diffstat (limited to 'build-aux')
0 files changed, 0 insertions, 0 deletions