summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-20 22:51:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-08-25 20:11:21 (GMT)
commit3acf8dd8879c638a517e3810d1df872adfbaaf30 (patch)
treede90a6de1e48938e0877f4d6ac68901bc440caa6 /builtin
parent82dee4160cc6d1b0d792c9f07b5803cd42abc610 (diff)
downloadgit-3acf8dd8879c638a517e3810d1df872adfbaaf30.zip
git-3acf8dd8879c638a517e3810d1df872adfbaaf30.tar.gz
git-3acf8dd8879c638a517e3810d1df872adfbaaf30.tar.bz2
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>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/log.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/builtin/log.c b/builtin/log.c
index 0cdd889..a491d3d 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++;