git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Nguyen Thai Ngoc Duy" <pclouds@gmail.com>,
	"David Turner" <dturner@twopensource.com>,
	"Eric Sunshine" <sunshine@sunshineco.com>,
	"Torsten Bögershausen" <tboegi@web.de>,
	"Christian Couder" <chriscool@tuxfamily.org>
Subject: [PATCH v3 07/11] dir: add new_untracked_cache()
Date: Wed, 23 Dec 2015 22:03:55 +0100	[thread overview]
Message-ID: <1450904639-25592-8-git-send-email-chriscool@tuxfamily.org> (raw)
In-Reply-To: <1450904639-25592-1-git-send-email-chriscool@tuxfamily.org>

    Factor out code into new_untracked_cache(), which will be used
    multiple times in a later commit.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 dir.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/dir.c b/dir.c
index 0f7e293..4227ba6 100644
--- a/dir.c
+++ b/dir.c
@@ -1938,16 +1938,20 @@ void add_untracked_ident(struct untracked_cache *uc)
 	strbuf_addch(&uc->ident, 0);
 }
 
+static void new_untracked_cache(void)
+{
+	struct untracked_cache *uc = xcalloc(1, sizeof(*uc));
+	strbuf_init(&uc->ident, 100);
+	uc->exclude_per_dir = ".gitignore";
+	/* should be the same flags used by git-status */
+	uc->dir_flags = DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
+	the_index.untracked = uc;
+}
+
 void add_untracked_cache(void)
 {
-	if (!the_index.untracked) {
-		struct untracked_cache *uc = xcalloc(1, sizeof(*uc));
-		strbuf_init(&uc->ident, 100);
-		uc->exclude_per_dir = ".gitignore";
-		/* should be the same flags used by git-status */
-		uc->dir_flags = DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
-		the_index.untracked = uc;
-	}
+	if (!the_index.untracked)
+		new_untracked_cache();
 	add_untracked_ident(the_index.untracked);
 	the_index.cache_changed |= UNTRACKED_CHANGED;
 }
-- 
2.7.0.rc2.11.g68ccdd4

  parent reply	other threads:[~2015-12-23 21:04 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-23 21:03 [PATCH v3 00/11] Untracked cache improvements Christian Couder
2015-12-23 21:03 ` [PATCH v3 01/11] dir: free untracked cache when removing it Christian Couder
2015-12-23 21:03 ` [PATCH v3 02/11] update-index: use enum for untracked cache options Christian Couder
2015-12-23 21:03 ` [PATCH v3 03/11] update-index: add --test-untracked-cache Christian Couder
2015-12-23 21:03 ` [PATCH v3 04/11] update-index: add untracked cache notifications Christian Couder
2015-12-24 10:01   ` Duy Nguyen
2015-12-24 21:11     ` Christian Couder
2015-12-23 21:03 ` [PATCH v3 05/11] update-index: move 'uc' var declaration Christian Couder
2015-12-23 21:03 ` [PATCH v3 06/11] dir: add add_untracked_cache() Christian Couder
2015-12-23 21:03 ` Christian Couder [this message]
2015-12-23 22:53   ` [PATCH v3 07/11] dir: add new_untracked_cache() Eric Sunshine
2015-12-24  7:35     ` Christian Couder
2015-12-23 21:03 ` [PATCH v3 08/11] dir: add remove_untracked_cache() Christian Couder
2015-12-23 21:03 ` [PATCH v3 09/11] dir: simplify untracked cache "ident" field Christian Couder
2015-12-23 21:03 ` [PATCH v3 10/11] config: add core.untrackedCache Christian Couder
2015-12-24 10:13   ` Duy Nguyen
2015-12-24 21:10     ` Christian Couder
2015-12-23 21:03 ` [PATCH v3 11/11] t7063: add tests for core.untrackedCache Christian Couder

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1450904639-25592-8-git-send-email-chriscool@tuxfamily.org \
    --to=christian.couder@gmail.com \
    --cc=avarab@gmail.com \
    --cc=chriscool@tuxfamily.org \
    --cc=dturner@twopensource.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    --cc=sunshine@sunshineco.com \
    --cc=tboegi@web.de \
    /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.
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 NNTP newsgroup(s).