From: Jeff Hostetler <git@jeffhostetler.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net, jonathantanmy@google.com,
christian.couder@gmail.com,
Jeff Hostetler <jeffhost@microsoft.com>
Subject: [PATCH v6 09/12] fixup: sha1_file: convert gotos to break/continue
Date: Tue, 5 Dec 2017 16:58:51 +0000 [thread overview]
Message-ID: <20171205165854.64979-10-git@jeffhostetler.com> (raw)
In-Reply-To: <20171205165854.64979-1-git@jeffhostetler.com>
From: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
---
sha1_file.c | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/sha1_file.c b/sha1_file.c
index fc7718a..ce67f27 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1180,30 +1180,30 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
}
}
-retry:
- if (find_pack_entry(real, &e))
- goto found_packed;
+ while (1) {
+ if (find_pack_entry(real, &e))
+ break;
- /* Most likely it's a loose object. */
- if (!sha1_loose_object_info(real, oi, flags))
- return 0;
+ /* Most likely it's a loose object. */
+ if (!sha1_loose_object_info(real, oi, flags))
+ return 0;
- /* Not a loose object; someone else may have just packed it. */
- reprepare_packed_git();
- if (find_pack_entry(real, &e))
- goto found_packed;
-
- /* Check if it is a missing object */
- if (fetch_if_missing && repository_format_partial_clone &&
- !already_retried) {
- fetch_object(repository_format_partial_clone, real);
- already_retried = 1;
- goto retry;
- }
+ /* Not a loose object; someone else may have just packed it. */
+ reprepare_packed_git();
+ if (find_pack_entry(real, &e))
+ break;
- return -1;
+ /* Check if it is a missing object */
+ if (fetch_if_missing && repository_format_partial_clone &&
+ !already_retried) {
+ fetch_object(repository_format_partial_clone, real);
+ already_retried = 1;
+ continue;
+ }
+
+ return -1;
+ }
-found_packed:
if (oi == &blank_oi)
/*
* We know that the caller doesn't actually need the
--
2.9.3
next prev parent reply other threads:[~2017-12-05 16:59 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-05 16:58 [PATCH v6 00/12] Partial clone part 2: fsck and promisors Jeff Hostetler
2017-12-05 16:58 ` [PATCH v6 01/12] extension.partialclone: introduce partial clone extension Jeff Hostetler
2017-12-05 16:58 ` [PATCH v6 02/12] fsck: introduce partialclone extension Jeff Hostetler
2017-12-05 16:58 ` [PATCH v6 03/12] fsck: support refs pointing to promisor objects Jeff Hostetler
2017-12-07 19:18 ` Brandon Williams
2017-12-07 19:27 ` Jonathan Tan
2017-12-07 19:40 ` Brandon Williams
2017-12-05 16:58 ` [PATCH v6 04/12] fsck: support referenced " Jeff Hostetler
2017-12-05 16:58 ` [PATCH v6 05/12] fsck: support promisor objects as CLI argument Jeff Hostetler
2017-12-05 16:58 ` [PATCH v6 06/12] index-pack: refactor writing of .keep files Jeff Hostetler
2017-12-05 16:58 ` [PATCH v6 07/12] introduce fetch-object: fetch one promisor object Jeff Hostetler
2017-12-05 16:58 ` [PATCH v6 08/12] sha1_file: support lazily fetching missing objects Jeff Hostetler
2017-12-05 16:58 ` Jeff Hostetler [this message]
2017-12-05 20:54 ` [PATCH v6 09/12] fixup: sha1_file: convert gotos to break/continue Junio C Hamano
2017-12-05 22:02 ` Jeff Hostetler
2017-12-05 21:03 ` Junio C Hamano
2017-12-07 19:44 ` Brandon Williams
2017-12-05 16:58 ` [PATCH v6 10/12] fixup: sha1_file: add TODO Jeff Hostetler
2017-12-05 16:58 ` [PATCH v6 11/12] rev-list: support termination at promisor objects Jeff Hostetler
2017-12-05 16:58 ` [PATCH v6 12/12] gc: do not repack promisor packfiles Jeff Hostetler
2017-12-05 20:02 ` [PATCH v6 00/12] Partial clone part 2: fsck and promisors Jonathan Tan
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=20171205165854.64979-10-git@jeffhostetler.com \
--to=git@jeffhostetler.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeffhost@microsoft.com \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
/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).