From: Jeff King <peff@peff.net>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Christopher Tiwald <christiwald@gmail.com>, git@vger.kernel.org
Subject: [RFC/PATCH 1/2] update-index: add --clear option
Date: Mon, 16 Apr 2012 12:02:32 -0400 [thread overview]
Message-ID: <20120416160232.GA1350@sigill.intra.peff.net> (raw)
In-Reply-To: <20120416152737.GB14724@sigill.intra.peff.net>
This just discards existing entries from the index, which
can be useful if you are rewriting all entries with
"--index-info" or similar.
Signed-off-by: Jeff King <peff@peff.net>
---
I tried to make something like:
git update-index --from-scratch --index-info
work by avoiding reading all entries in the first place. However,
update-index actually processes its arguments sequentially, so we _must_
read the index before we start processing arguments. But because it's
sequential, a "clear" operation makes sense, since you clear, then add
new entries.
Documentation/git-update-index.txt | 3 +++
builtin/update-index.c | 10 ++++++++++
2 files changed, 13 insertions(+)
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index a3081f4..47f0ae6 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -71,6 +71,9 @@ OPTIONS
--cacheinfo <mode> <object> <path>::
Directly insert the specified info into the index.
+--clear::
+ Discard all existing entries from the index.
+
--index-info::
Read index information from stdin.
diff --git a/builtin/update-index.c b/builtin/update-index.c
index a6a23fa..559dfae 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -645,6 +645,13 @@ static int cacheinfo_callback(struct parse_opt_ctx_t *ctx,
return 0;
}
+static int clear_callback(const struct option *opt,
+ const char *arg, int unset)
+{
+ discard_cache();
+ return 0;
+}
+
static int stdin_cacheinfo_callback(struct parse_opt_ctx_t *ctx,
const struct option *opt, int unset)
{
@@ -774,6 +781,9 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
"add entries from standard input to the index",
PARSE_OPT_NONEG | PARSE_OPT_NOARG,
(parse_opt_cb *) stdin_cacheinfo_callback},
+ {OPTION_CALLBACK, 0, "clear", NULL, NULL,
+ "drop all index entries", PARSE_OPT_NONEG | PARSE_OPT_NOARG,
+ clear_callback},
{OPTION_LOWLEVEL_CALLBACK, 0, "unresolve", &has_errors, NULL,
"repopulate stages #2 and #3 for the listed paths",
PARSE_OPT_NONEG | PARSE_OPT_NOARG,
--
1.7.9.6.8.g992e5
next prev parent reply other threads:[~2012-04-16 16:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-14 16:00 Filter-branch's "move tree to subdirectory" example fails with BSD sed? Christopher Tiwald
2012-04-14 19:25 ` Johannes Sixt
2012-04-16 15:27 ` Jeff King
2012-04-16 16:02 ` Jeff King [this message]
2012-04-16 21:48 ` [RFC/PATCH 1/2] update-index: add --clear option Christopher Tiwald
2012-04-17 18:36 ` Christopher Tiwald
2012-04-16 16:03 ` [RFC/PATCH 2/2] docs/filter-branch: clean up newsubdir example Jeff King
2012-04-16 17:03 ` Filter-branch's "move tree to subdirectory" example fails with BSD sed? Junio C Hamano
2012-04-16 17:13 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120416160232.GA1350@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=christiwald@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
/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).