git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Michael Haggerty" <mhagger@alum.mit.edu>,
	"Stefan Beller" <sbeller@google.com>,
	"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v2 04/12] refs.c: refactor get_submodule_ref_store(), share common free block
Date: Sat, 18 Mar 2017 17:11:45 +0700	[thread overview]
Message-ID: <20170318101153.6901-5-pclouds@gmail.com> (raw)
In-Reply-To: <20170318101153.6901-1-pclouds@gmail.com>

---
 refs.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/refs.c b/refs.c
index 6695140cfe..8912798c1d 100644
--- a/refs.c
+++ b/refs.c
@@ -1571,25 +1571,23 @@ struct ref_store *get_submodule_ref_store(const char *submodule)
 
 	refs = lookup_submodule_ref_store(submodule);
 	if (refs)
-		return refs;
+		goto done;
 
 	strbuf_addstr(&submodule_sb, submodule);
 	ret = is_nonbare_repository_dir(&submodule_sb);
-	strbuf_release(&submodule_sb);
 	if (!ret)
-		return NULL;
+		goto done;
 
 	ret = submodule_to_gitdir(&submodule_sb, submodule);
-	if (ret) {
-		strbuf_release(&submodule_sb);
-		return NULL;
-	}
+	if (ret)
+		goto done;
 
 	/* pretend that add_submodule_odb() has been called */
 	refs = ref_store_init(submodule_sb.buf,
 			      REF_STORE_READ | REF_STORE_ODB);
 	register_submodule_ref_store(refs, submodule);
 
+done:
 	strbuf_release(&submodule_sb);
 	return refs;
 }
-- 
2.11.0.157.gd943d85


  parent reply	other threads:[~2017-03-18 10:12 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-17 14:18 [PATCH/RFC 00/15] Fix git-gc losing objects in multi worktree Nguyễn Thái Ngọc Duy
2017-02-17 14:18 ` [PATCH 01/15] revision.h: new flag in struct rev_info wrt. worktree-related refs Nguyễn Thái Ngọc Duy
2017-02-17 14:18 ` [PATCH 02/15] revision.c: refactor add_index_objects_to_pending() Nguyễn Thái Ngọc Duy
2017-02-17 14:18 ` [PATCH 03/15] revision.c: --indexed-objects add objects from all worktrees Nguyễn Thái Ngọc Duy
2017-02-17 14:18 ` [PATCH 04/15] refs: move submodule slash stripping code to get_submodule_ref_store Nguyễn Thái Ngọc Duy
2017-02-17 14:18 ` [PATCH 05/15] refs: add refs_read_ref[_full]() Nguyễn Thái Ngọc Duy
2017-02-17 14:18 ` [PATCH 06/15] refs: add refs_head_ref() Nguyễn Thái Ngọc Duy
2017-02-17 14:19 ` [PATCH 07/15] refs: add refs_for_each_ref() Nguyễn Thái Ngọc Duy
2017-02-17 14:19 ` [PATCH 08/15] refs: add a refs_for_each_in() and friends Nguyễn Thái Ngọc Duy
2017-02-17 14:19 ` [PATCH 09/15] revision.c: use refs_for_each*() instead of for_each_*_submodule() Nguyễn Thái Ngọc Duy
2017-02-17 14:19 ` [PATCH 10/15] refs: remove dead for_each_*_submodule() Nguyễn Thái Ngọc Duy
2017-02-17 14:19 ` [PATCH 11/15] revision.c: --all adds HEAD from all worktrees Nguyễn Thái Ngọc Duy
2017-02-17 14:19 ` [PATCH 12/15] refs: add refs_for_each_reflog[_ent]() Nguyễn Thái Ngọc Duy
2017-02-17 14:19 ` [PATCH 13/15] files-backend: make reflog iterator go through per-worktree reflog Nguyễn Thái Ngọc Duy
2017-02-17 14:19 ` [PATCH 14/15] revision.c: --reflog add HEAD reflog from all worktrees Nguyễn Thái Ngọc Duy
2017-02-17 14:19 ` [PATCH 15/15] rev-list: expose and document --single-worktree Nguyễn Thái Ngọc Duy
2017-02-17 17:09 ` [PATCH/RFC 00/15] Fix git-gc losing objects in multi worktree Johannes Schindelin
2017-03-18 10:11 ` [PATCH v2 00/12] " Nguyễn Thái Ngọc Duy
2017-03-18 10:11   ` [PATCH v2 01/12] revision.h: new flag in struct rev_info wrt. worktree-related refs Nguyễn Thái Ngọc Duy
2017-03-18 10:11   ` [PATCH v2 02/12] revision.c: refactor add_index_objects_to_pending() Nguyễn Thái Ngọc Duy
2017-03-18 10:11   ` [PATCH v2 03/12] revision.c: --indexed-objects add objects from all worktrees Nguyễn Thái Ngọc Duy
2017-03-18 10:11   ` Nguyễn Thái Ngọc Duy [this message]
2017-03-18 10:11   ` [PATCH v2 05/12] refs: move submodule slash stripping code to get_submodule_ref_store Nguyễn Thái Ngọc Duy
2017-03-18 10:11   ` [PATCH v2 06/12] refs: add refs_head_ref() Nguyễn Thái Ngọc Duy
2017-03-18 10:11   ` [PATCH v2 07/12] revision.c: use refs_for_each*() instead of for_each_*_submodule() Nguyễn Thái Ngọc Duy
2017-03-18 10:11   ` [PATCH v2 08/12] refs: remove dead for_each_*_submodule() Nguyễn Thái Ngọc Duy
2017-03-18 10:11   ` [PATCH v2 09/12] revision.c: --all adds HEAD from all worktrees Nguyễn Thái Ngọc Duy
2017-03-18 10:11   ` [PATCH v2 10/12] files-backend: make reflog iterator go through per-worktree reflog Nguyễn Thái Ngọc Duy
2017-03-18 10:11   ` [PATCH v2 11/12] revision.c: --reflog add HEAD reflog from all worktrees Nguyễn Thái Ngọc Duy
2017-03-18 10:11   ` [PATCH v2 12/12] rev-list: expose and document --single-worktree Nguyễn Thái Ngọc Duy
2017-03-18 18:00     ` Junio C Hamano
2017-04-19 10:52       ` Duy Nguyen
2017-04-20  2:21         ` Junio C Hamano

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=20170318101153.6901-5-pclouds@gmail.com \
    --to=pclouds@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mhagger@alum.mit.edu \
    --cc=sbeller@google.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).