From: Ben Peart <peartben@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, benpeart@microsoft.com, peartben@gmail.com,
peff@peff.net, sunshine@sunshineco.com
Subject: [PATCH v4 1/3] reset: don't compute unstaged changes after reset when --quiet
Date: Tue, 23 Oct 2018 15:04:21 -0400 [thread overview]
Message-ID: <20181023190423.5772-2-peartben@gmail.com> (raw)
In-Reply-To: <20181023190423.5772-1-peartben@gmail.com>
From: Ben Peart <benpeart@microsoft.com>
When git reset is run with the --quiet flag, don't bother finding any
additional unstaged changes as they won't be output anyway. This speeds up
the git reset command by avoiding having to lstat() every file looking for
changes that aren't going to be reported anyway.
The savings can be significant. In a repo on Windows with 200K files
"git reset" drops from 7.16 seconds to 0.32 seconds for a savings of 96%.
Signed-off-by: Ben Peart <benpeart@microsoft.com>
---
builtin/reset.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/reset.c b/builtin/reset.c
index 11cd0dcb8c..04f0d9b4f5 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -375,7 +375,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
int flags = quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN;
if (read_from_tree(&pathspec, &oid, intent_to_add))
return 1;
- if (get_git_work_tree())
+ if (!quiet && get_git_work_tree())
refresh_index(&the_index, flags, NULL, NULL,
_("Unstaged changes after reset:"));
} else {
--
2.18.0.windows.1
next prev parent reply other threads:[~2018-10-23 19:04 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-17 16:40 [PATCH v1 0/2] speed up git reset Ben Peart
2018-10-17 16:40 ` [PATCH v1 1/2] reset: don't compute unstaged changes after reset when --quiet Ben Peart
2018-10-17 18:14 ` Eric Sunshine
2018-10-17 18:22 ` Jeff King
2018-10-18 3:40 ` Junio C Hamano
2018-10-18 6:36 ` Jeff King
2018-10-18 18:15 ` Ben Peart
2018-10-18 18:26 ` Duy Nguyen
2018-10-18 19:03 ` Ben Peart
2018-10-19 0:34 ` Junio C Hamano
2018-10-17 16:40 ` [PATCH v1 2/2] reset: add new reset.quietDefault config setting Ben Peart
2018-10-17 18:19 ` Eric Sunshine
2018-10-17 18:23 ` Jeff King
2018-10-23 9:13 ` Ævar Arnfjörð Bjarmason
2018-10-23 18:11 ` Ben Peart
2018-10-23 20:02 ` Jeff King
2018-10-23 20:03 ` Ævar Arnfjörð Bjarmason
2018-10-24 15:48 ` Recommended configurations (was Re: [PATCH v1 2/2] reset: add new reset.quietDefault config setting) Derrick Stolee
2018-10-24 23:58 ` Jeff King
2018-10-25 4:09 ` Junio C Hamano
2018-10-19 16:12 ` [PATCH v2 0/3] speed up git reset Ben Peart
2018-10-19 16:12 ` [PATCH v2 1/3] reset: don't compute unstaged changes after reset when --quiet Ben Peart
2018-10-19 16:12 ` [PATCH v2 2/3] reset: add new reset.quiet config setting Ben Peart
2018-10-19 16:36 ` Eric Sunshine
2018-10-19 16:46 ` Jeff King
2018-10-19 17:10 ` Eric Sunshine
2018-10-19 17:11 ` Jeff King
2018-10-19 17:23 ` Ben Peart
2018-10-19 19:08 ` Jeff King
2018-10-22 5:04 ` Junio C Hamano
2018-10-19 17:11 ` Ben Peart
2018-10-19 16:12 ` [PATCH v2 3/3] reset: warn when refresh_index() takes more than 2 seconds Ben Peart
2018-10-22 13:18 ` [PATCH v3 0/3] speed up git reset Ben Peart
2018-10-22 13:18 ` [PATCH v3 1/3] reset: don't compute unstaged changes after reset when --quiet Ben Peart
2018-10-22 20:44 ` Johannes Schindelin
2018-10-22 22:07 ` Ben Peart
2018-10-23 8:53 ` Johannes Schindelin
2018-10-23 15:46 ` Duy Nguyen
2018-10-23 19:55 ` Johannes Schindelin
2018-10-22 13:18 ` [PATCH v3 2/3] reset: add new reset.quiet config setting Ben Peart
2018-10-22 14:45 ` Duy Nguyen
2018-10-23 18:47 ` Ben Peart
2018-10-24 2:56 ` Junio C Hamano
2018-10-24 7:21 ` Junio C Hamano
2018-10-24 14:54 ` Duy Nguyen
2018-10-25 1:12 ` Junio C Hamano
2018-10-24 14:49 ` Duy Nguyen
2018-10-22 19:13 ` Ramsay Jones
2018-10-22 20:06 ` Jeff King
2018-10-23 17:31 ` Ben Peart
2018-10-23 17:35 ` Jeff King
2018-10-22 13:18 ` [PATCH v3 3/3] reset: warn when refresh_index() takes more than 2 seconds Ben Peart
2018-10-23 0:23 ` Junio C Hamano
2018-10-23 17:12 ` Ben Peart
2018-10-23 19:04 ` [PATCH v4 0/3] speed up git reset Ben Peart
2018-10-23 19:04 ` Ben Peart [this message]
2018-10-23 19:04 ` [PATCH v4 2/3] reset: add new reset.quiet config setting Ben Peart
2018-10-24 0:39 ` Ramsay Jones
2018-10-25 4:56 ` Junio C Hamano
2018-10-25 9:26 ` Junio C Hamano
2018-10-25 13:26 ` Ben Peart
2018-10-25 17:04 ` Ramsay Jones
2018-10-23 19:04 ` [PATCH v4 3/3] reset: warn when refresh_index() takes more than 2 seconds Ben Peart
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=20181023190423.5772-2-peartben@gmail.com \
--to=peartben@gmail.com \
--cc=benpeart@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.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.
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).