From: Martin von Zweigbergk <martinvonz@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Martin von Zweigbergk <martinvonz@gmail.com>
Subject: [PATCH 00/19] reset improvements
Date: Wed, 9 Jan 2013 00:15:57 -0800 [thread overview]
Message-ID: <1357719376-16406-1-git-send-email-martinvonz@gmail.com> (raw)
This is kind of a re-roll of [1] (wow, apparently it took me almost
two months to get done). The goal was, then and now, to teach "git
reset" to work on an unborn branch and to not require a commit when a
tree would do. This time, I also made some tangential improvements
along the way, mostly related to readability and performance.
As usual, the risker patches are towards the end. In particular, I
find it hard to evaluate how risky the last patch is. That last patch
is responsible for much of the improvements in the timing table below,
so it would be nice if it doesn't break things too badly (test pass,
of course). The timings are best-of-five, wall time.
Command Before After
reset (warm) 0.23 0.07
reset -q (warm) 0.23 0.03
reset . (warm) 0.09 0.07
reset -q . (warm) 0.09 0.03
reset --keep (warm) 0.31 0.29
reset --keep -q (warm) 0.31 0.29
reset (cold) 9.74 2.60
reset -q (cold) 9.85 0.37
reset . (cold) 2.66 2.51
reset -q . (cold) 2.59 0.33
reset --keep (cold) 7.58 7.52
reset --keep -q (cold) 7.37 7.21
[1] http://thread.gmane.org/gmane.comp.version-control.git/210568/focus=210855
Martin von Zweigbergk (19):
reset $pathspec: no need to discard index
reset $pathspec: exit with code 0 if successful
reset.c: pass pathspec around instead of (prefix, argv) pair
reset: don't allow "git reset -- $pathspec" in bare repo
reset.c: extract function for parsing arguments
reset.c: remove unnecessary variable 'i'
reset.c: extract function for updating {ORIG,}HEAD
reset.c: share call to die_if_unmerged_cache()
reset.c: replace switch by if-else
reset --keep: only write index file once
reset: avoid redundant error message
reset.c: move update_index_refresh() call out of read_from_tree()
reset.c: move lock, write and commit out of update_index_refresh()
reset [--mixed]: don't write index file twice
reset.c: finish entire cmd_reset() whether or not pathspec is given
reset [--mixed] --quiet: don't refresh index
reset $sha1 $pathspec: require $sha1 only to be treeish
reset: allow reset on unborn branch
reset [--mixed]: use diff-based reset whether or not pathspec was
given
builtin/reset.c | 281 +++++++++++++++++++----------------------
t/t2013-checkout-submodule.sh | 2 +-
t/t7102-reset.sh | 26 +++-
t/t7106-reset-unborn-branch.sh | 52 ++++++++
4 files changed, 200 insertions(+), 161 deletions(-)
create mode 100755 t/t7106-reset-unborn-branch.sh
--
1.8.1.rc3.331.g1ef2165
next reply other threads:[~2013-01-09 8:23 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-09 8:15 Martin von Zweigbergk [this message]
2013-01-09 8:15 ` [PATCH 01/19] reset $pathspec: no need to discard index Martin von Zweigbergk
2013-01-09 8:15 ` [PATCH 02/19] reset $pathspec: exit with code 0 if successful Martin von Zweigbergk
2013-01-09 8:16 ` [PATCH 03/19] reset.c: pass pathspec around instead of (prefix, argv) pair Martin von Zweigbergk
2013-01-09 11:42 ` Matt Kraai
2013-01-09 19:26 ` Junio C Hamano
2013-01-10 11:05 ` Duy Nguyen
2013-01-10 23:09 ` Junio C Hamano
2013-01-11 11:10 ` Duy Nguyen
2013-01-09 8:16 ` [PATCH 04/19] reset: don't allow "git reset -- $pathspec" in bare repo Martin von Zweigbergk
2013-01-09 19:32 ` Junio C Hamano
2013-01-10 8:24 ` Martin von Zweigbergk
2013-01-10 18:04 ` Junio C Hamano
2013-01-09 8:16 ` [PATCH 05/19] reset.c: extract function for parsing arguments Martin von Zweigbergk
2013-01-09 8:16 ` [PATCH 06/19] reset.c: remove unnecessary variable 'i' Martin von Zweigbergk
2013-01-09 19:39 ` Junio C Hamano
2013-01-10 8:41 ` Martin von Zweigbergk
2013-01-09 8:16 ` [PATCH 07/19] reset.c: extract function for updating {ORIG,}HEAD Martin von Zweigbergk
2013-01-09 11:54 ` Matt Kraai
2013-01-09 8:16 ` [PATCH 08/19] reset.c: share call to die_if_unmerged_cache() Martin von Zweigbergk
2013-01-09 19:48 ` Junio C Hamano
2013-01-10 8:51 ` Martin von Zweigbergk
2013-01-09 8:16 ` [PATCH 09/19] reset.c: replace switch by if-else Martin von Zweigbergk
2013-01-09 19:53 ` Junio C Hamano
2013-01-11 6:35 ` Martin von Zweigbergk
2013-01-11 17:12 ` Junio C Hamano
2013-01-09 8:16 ` [PATCH 10/19] reset --keep: only write index file once Martin von Zweigbergk
2013-01-09 19:55 ` Junio C Hamano
2013-01-09 8:16 ` [PATCH 11/19] reset: avoid redundant error message Martin von Zweigbergk
2013-01-09 8:16 ` [PATCH 12/19] reset.c: move update_index_refresh() call out of read_from_tree() Martin von Zweigbergk
2013-01-09 8:16 ` [PATCH 13/19] reset.c: move lock, write and commit out of update_index_refresh() Martin von Zweigbergk
2013-01-09 8:16 ` [PATCH 14/19] reset [--mixed]: don't write index file twice Martin von Zweigbergk
2013-01-09 8:16 ` [PATCH 15/19] reset.c: finish entire cmd_reset() whether or not pathspec is given Martin von Zweigbergk
2013-01-09 19:59 ` Junio C Hamano
2013-01-09 8:16 ` [PATCH 16/19] reset [--mixed] --quiet: don't refresh index Martin von Zweigbergk
2013-01-09 17:01 ` Jeff King
2013-01-09 18:43 ` Martin von Zweigbergk
2013-01-09 19:12 ` Junio C Hamano
2013-01-09 19:38 ` Martin von Zweigbergk
2013-01-09 20:05 ` Junio C Hamano
2013-01-09 8:16 ` [PATCH 17/19] reset $sha1 $pathspec: require $sha1 only to be treeish Martin von Zweigbergk
2013-01-09 20:23 ` Junio C Hamano
2013-01-09 8:16 ` [PATCH 18/19] reset: allow reset on unborn branch Martin von Zweigbergk
2013-01-09 8:16 ` [PATCH 19/19] reset [--mixed]: use diff-based reset whether or not pathspec was given Martin von Zweigbergk
2013-01-09 20:27 ` Junio C Hamano
2013-01-15 5:47 ` [PATCH v2 00/19] reset improvements Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 01/19] reset $pathspec: no need to discard index Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 02/19] reset $pathspec: exit with code 0 if successful Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 03/19] reset.c: pass pathspec around instead of (prefix, argv) pair Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 04/19] reset: don't allow "git reset -- $pathspec" in bare repo Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 05/19] reset.c: extract function for parsing arguments Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 06/19] reset.c: remove unnecessary variable 'i' Martin von Zweigbergk
[not found] ` <A5E8E180685CEF45AB9E737A010799805E00DD@cdnz-ex1.corp.cubic.cub>
2013-01-15 18:36 ` Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 07/19] reset.c: extract function for updating {ORIG_,}HEAD Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 08/19] reset.c: share call to die_if_unmerged_cache() Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 09/19] reset --keep: only write index file once Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 10/19] reset: avoid redundant error message Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 11/19] reset.c: replace switch by if-else Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 12/19] reset.c: move update_index_refresh() call out of read_from_tree() Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 13/19] reset.c: move lock, write and commit out of update_index_refresh() Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 14/19] reset [--mixed]: only write index file once Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 15/19] reset.c: finish entire cmd_reset() whether or not pathspec is given Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 16/19] reset.c: inline update_index_refresh() Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 17/19] reset $sha1 $pathspec: require $sha1 only to be treeish Martin von Zweigbergk
2013-01-16 18:00 ` [PATCH v2 17/19] fixup! " Martin von Zweigbergk
2013-01-16 18:08 ` Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 18/19] reset: allow reset on unborn branch Martin von Zweigbergk
2013-01-15 5:47 ` [PATCH v2 19/19] reset [--mixed]: use diff-based reset whether or not pathspec was given Martin von Zweigbergk
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=1357719376-16406-1-git-send-email-martinvonz@gmail.com \
--to=martinvonz@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).