From: Alex Henrie <alexhenrie24@gmail.com>
To: git@vger.kernel.org, dstolee@microsoft.com, gitster@pobox.com,
cb@hashpling.org
Cc: Alex Henrie <alexhenrie24@gmail.com>
Subject: [PATCH v5] diffcore-break: use a goto instead of a redundant if statement
Date: Mon, 30 Sep 2019 20:29:35 -0600 [thread overview]
Message-ID: <20191001022936.1757141-2-alexhenrie24@gmail.com> (raw)
In-Reply-To: <20191001022936.1757141-1-alexhenrie24@gmail.com>
The condition "if (q->nr <= j)" checks whether the loop exited normally
or via a break statement. Avoid this check by replacing the jump out of
the inner loop with a jump to the end of the outer loop, which makes it
obvious that diff_q is not executed when the peer survives.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
diffcore-break.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/diffcore-break.c b/diffcore-break.c
index 875aefd3fe..9d20a6a6fc 100644
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -286,17 +286,17 @@ void diffcore_merge_broken(void)
/* Peer survived. Merge them */
merge_broken(p, pp, &outq);
q->queue[j] = NULL;
- break;
+ goto next;
}
}
- if (q->nr <= j)
- /* The peer did not survive, so we keep
- * it in the output.
- */
- diff_q(&outq, p);
+ /* The peer did not survive, so we keep
+ * it in the output.
+ */
+ diff_q(&outq, p);
}
else
diff_q(&outq, p);
+next:;
}
free(q->queue);
*q = outq;
--
2.23.0
next prev parent reply other threads:[~2019-10-01 2:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-01 2:29 [PATCH v5] commit-graph: remove a duplicate assignment Alex Henrie
2019-10-01 2:29 ` Alex Henrie [this message]
2019-10-01 2:29 ` [PATCH v5] wrapper: use a loop instead of repetitive statements Alex Henrie
2019-10-02 6:06 ` Junio C Hamano
2019-10-02 15:32 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191001022936.1757141-2-alexhenrie24@gmail.com \
--to=alexhenrie24@gmail.com \
--cc=cb@hashpling.org \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).