From 9213b3079d72b2d89f183223cbca92bf41d5e15b Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Nov 23 2018 09:43:22 +0000 Subject: Small wording improvement in the logs This just to help distinguish when PRs have been merged vs just checked for their merge-ability. Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 47ff257..31b5824 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -1563,7 +1563,7 @@ def merge_pull_request(session, request, username, domerge=True): return "Changes merged!" else: - _log.info(" PR merged using fast-forward, reporting it") + _log.info(" PR can be merged using fast-forward, reporting it") request.merge_status = "FFORWARD" session.commit() return "FFORWARD" @@ -1674,7 +1674,7 @@ def merge_pull_request(session, request, username, domerge=True): pull_request=request, ) else: - _log.info(" PR merged using fast-forward, reporting it") + _log.info(" PR can be merged using fast-forward, reporting it") request.merge_status = "FFORWARD" session.commit() return "FFORWARD"