From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 20 Aug 2015 22:51:45 +0000 (-0700)
Subject: builtin/log.c: minor reformat
X-Git-Tag: v2.6.0-rc0~21^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3acf8dd8879c638a517e3810d1df872adfbaaf30;p=git

builtin/log.c: minor reformat

Two logical lines that were not overly long was split in the middle,
which made them read worse.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/log.c b/builtin/log.c
index 0cdd88971d..a491d3dea0 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -342,8 +342,7 @@ static int cmd_log_walk(struct rev_info *rev)
 	 * retain that state information if replacing rev->diffopt in this loop
 	 */
 	while ((commit = get_revision(rev)) != NULL) {
-		if (!log_tree_commit(rev, commit) &&
-		    rev->max_count >= 0)
+		if (!log_tree_commit(rev, commit) && rev->max_count >= 0)
 			/*
 			 * We decremented max_count in get_revision,
 			 * but we didn't actually show the commit.
@@ -1464,8 +1463,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 			continue;
 		}
 
-		if (ignore_if_in_upstream &&
-				has_commit_patch_id(commit, &ids))
+		if (ignore_if_in_upstream && has_commit_patch_id(commit, &ids))
 			continue;
 
 		nr++;