Adjust this code that'll be modified in a subsequent change to have
more than one line per branch to use braces per the CodingGuidelines,
this makes the later change easier to understand.
Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com>
---
diff.c | 5 +++--
revision.c | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/diff.c b/diff.c
index cab79d24ab..e0141cfbc0 100644
--- a/diff.c
+++ b/diff.c
@@ -4807,10 +4807,11 @@ int diff_opt_parse(struct diff_options *options,
options->abbrev = strtoul(arg, &end, 10);
if (*end)
die("--abbrev expects a numerical value, got '%s'",
arg);
- if (options->abbrev < MINIMUM_ABBREV)
+ if (options->abbrev < MINIMUM_ABBREV) {
options->abbrev = MINIMUM_ABBREV;
- else if (the_hash_algo->hexsz < options->abbrev)
+ } else if (the_hash_algo->hexsz < options->abbrev) {
options->abbrev = the_hash_algo->hexsz;
+ }
}
else if ((argcount = parse_long_opt("src-prefix", av, &optarg))) {
options->a_prefix = optarg;
diff --git a/revision.c b/revision.c
index d39a292895..2a75fef22d 100644
--- a/revision.c
+++ b/revision.c
@@ -2053,10 +2053,11 @@ static int handle_revision_opt(struct rev_info *revs,
int argc, const char **arg
revs->abbrev = strtoul(optarg, &end, 10);
if (*end)
die("--abbrev expects a numerical value, got '%s'",
optarg);
- if (revs->abbrev < MINIMUM_ABBREV)
+ if (revs->abbrev < MINIMUM_ABBREV) {
revs->abbrev = MINIMUM_ABBREV;
- else if (revs->abbrev > hexsz)
+ } else if (revs->abbrev > hexsz) {
revs->abbrev = hexsz;
+ }
} else if (!strcmp(arg, "--abbrev-commit")) {
revs->abbrev_commit = 1;
revs->abbrev_commit_given = 1;
--
2.17.0.290.gded63e768a
