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 05/11] update-index: move 'uc' var declaration
Date: Wed, 23 Dec 2015 22:03:53 +0100 [thread overview]
Message-ID: <1450904639-25592-6-git-send-email-chriscool@tuxfamily.org> (raw)
In-Reply-To: <1450904639-25592-1-git-send-email-chriscool@tuxfamily.org>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
builtin/update-index.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index c91e695..f667125 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -1116,8 +1116,6 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
the_index.cache_changed |= SOMETHING_CHANGED;
}
if (untracked_cache > UC_DISABLE) {
- struct untracked_cache *uc;
-
if (untracked_cache < UC_FORCE) {
setup_work_tree();
if (!test_if_untracked_cache_is_supported())
@@ -1126,7 +1124,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
return 0;
}
if (!the_index.untracked) {
- uc = xcalloc(1, sizeof(*uc));
+ 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 */
--
2.7.0.rc2.11.g68ccdd4
next prev 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 ` Christian Couder [this message]
2015-12-23 21:03 ` [PATCH v3 06/11] dir: add add_untracked_cache() Christian Couder
2015-12-23 21:03 ` [PATCH v3 07/11] dir: add new_untracked_cache() Christian Couder
2015-12-23 22:53 ` 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-6-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).