From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Alan Chandler <alan@chandlerfamily.org.uk>, git@vger.kernel.org
Subject: Re: Some advanced index playing
Date: Mon, 04 Dec 2006 02:41:49 -0800 [thread overview]
Message-ID: <7vveksoscy.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.64.0612031008360.3476@woody.osdl.org> (Linus Torvalds's message of "Sun, 3 Dec 2006 10:24:11 -0800 (PST)")
Linus Torvalds <torvalds@osdl.org> writes:
> I think that is actually a misfeature.
>
> This _should_ just work. It's the easy and logical way to do it, and it's
> the one that matches all the other behaviours of "git commit" these days.
> ...
> So anyway, I would suggest that we just get rid of that partial commit
> "safety check" in "git commit" for now. It still makes sense for when
> you're in the middle of a _merge_, but the "verify that index matches" is
> not worth it.
The codepath has a big "don't do this during a merge" check in
front. I think this is a safe thing to do, so let's do this.
diff --git a/git-commit.sh b/git-commit.sh
index 81c3a0c..c829791 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -350,19 +350,9 @@ t,)
refuse_partial "Cannot do a partial commit during a merge."
fi
TMP_INDEX="$GIT_DIR/tmp-index$$"
- if test -z "$initial_commit"
- then
- # make sure index is clean at the specified paths, or
- # they are additions.
- dirty_in_index=`git-diff-index --cached --name-status \
- --diff-filter=DMTU HEAD -- "$@"`
- test -z "$dirty_in_index" ||
- refuse_partial "Different in index and the last commit:
-$dirty_in_index"
- fi
commit_only=`git-ls-files --error-unmatch -- "$@"` || exit
- # Build the temporary index and update the real index
+ # Build a temporary index and update the real index
# the same way.
if test -z "$initial_commit"
then
next prev parent reply other threads:[~2006-12-04 10:41 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-03 17:01 Some advanced index playing Alan Chandler
2006-12-03 18:24 ` Linus Torvalds
2006-12-03 19:36 ` Junio C Hamano
2006-12-03 20:11 ` Alan Chandler
2006-12-03 20:19 ` Jakub Narebski
2006-12-03 20:29 ` Alan Chandler
2006-12-03 20:40 ` Linus Torvalds
2006-12-04 10:41 ` Junio C Hamano [this message]
2006-12-03 18:31 ` Jakub Narebski
2006-12-03 18:34 ` Linus Torvalds
2006-12-03 20:26 ` Junio C Hamano
2006-12-05 3:48 ` [PATCH] git-explain Junio C Hamano
2006-12-05 3:55 ` Nicolas Pitre
2006-12-05 3:57 ` J. Bruce Fields
2006-12-05 6:09 ` Junio C Hamano
2006-12-05 7:26 ` Jeff King
2006-12-05 9:21 ` Eric Wong
2006-12-08 10:49 ` [RFC/PATCH 0/5] WIP status/rerere reporting Eric Wong
2006-12-08 10:49 ` [PATCH 1/5] rerere: avoid misrecording on a skipped or aborted rebase/am Eric Wong
2006-12-08 19:33 ` Junio C Hamano
2006-12-08 20:04 ` [PATCH 6/5] git-rerere: document the 'clear' and 'diff' commands Eric Wong
2006-12-08 20:43 ` [PATCH 1/5] rerere: avoid misrecording on a skipped or aborted rebase/am Junio C Hamano
2006-12-08 21:28 ` Eric Wong
2006-12-08 21:29 ` [PATCH] rerere: add clear, diff, and status commands Eric Wong
2006-12-08 21:29 ` [PATCH] rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am Eric Wong
2006-12-08 21:44 ` Jakub Narebski
2006-12-08 21:50 ` Eric Wong
2006-12-09 20:08 ` Junio C Hamano
2006-12-08 10:49 ` [PATCH 2/5] status: show files that would have resolutions recorded by rerere Eric Wong
2006-12-08 10:49 ` [PATCH 3/5] am and rebase resolve states get picked up by status/commit Eric Wong
2006-12-08 10:49 ` [PATCH 4/5] am: run git rerere to record resolution on successful --resolved Eric Wong
2006-12-08 10:49 ` [PATCH 5/5] rerere: add the diff command Eric Wong
2006-12-08 12:07 ` Jakub Narebski
2006-12-05 17:34 ` [PATCH] git-explain Horst H. von Brand
2006-12-05 8:58 ` Johannes Schindelin
2006-12-05 21:00 ` J. Bruce Fields
2006-12-05 9:11 ` Raimund Bauer
2006-12-05 10:43 ` Jakub Narebski
2006-12-05 23:00 ` Martin Langhoff
2006-12-05 23:07 ` Junio C Hamano
2006-12-05 23:37 ` Johannes Schindelin
2006-12-05 23:57 ` Junio C Hamano
2006-12-06 0:07 ` Carl Worth
2006-12-06 0:27 ` Johannes Schindelin
2006-12-06 1:50 ` Nicolas Pitre
2006-12-03 20:40 ` Some advanced index playing Alan Chandler
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=7vveksoscy.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=alan@chandlerfamily.org.uk \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.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.
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).