From 37f9cc5718d31762c3a3b39d9017fe70f89c3b80 Mon Sep 17 00:00:00 2001 From: Maxim Uvarov Date: Fri, 11 Jan 2013 11:56:19 -0800 Subject: [PATCH] git-changelog: don't print debug info Do not print debug info in case if merge commit does not have any bug reference. Signed-off-by: Maxim Uvarov --- scripts/git-changelog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/git-changelog b/scripts/git-changelog index bb1023624929..deec32ba7643 100755 --- a/scripts/git-changelog +++ b/scripts/git-changelog @@ -103,11 +103,10 @@ class ChangeLog: #If commit has merge commit check if there is Bug # if is_merge == 1: - return "Merge 1 commit %s" % commit - found = 0 + return ret + for key in self.merges: if commit in self.merges[key]: - found = 1 return self._get_orabug(key, is_merge = 1) return ret -- 2.50.1