From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: Re: Simplify "git reset --hard"
Date: Mon, 15 May 2006 00:08:45 -0700 [thread overview]
Message-ID: <7vwtcnvk76.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <7v1wuvwzdv.fsf@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Sun, 14 May 2006 23:55:24 -0700")
Junio C Hamano <junkio@cox.net> writes:
>> Instead, just pass in "-u" to git-read-tree when we do a hard reset, and
>> depend on git-read-tree to update the working tree appropriately.
>
> Well, this is wrong. Local modifications remain after your
> version of "git-reset --hard HEAD". which is not what we want
> from a hard reset.
... and attempting to paper it over in git-reset.sh is also
wrong. Keep your "--hard is noop" change in git-reset.sh and
replace it with this would be the right fix.
-- >8 --
diff --git a/read-tree.c b/read-tree.c
index 11157f4..c135f08 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -686,6 +686,7 @@ static int oneway_merge(struct cache_ent
if (!a)
return deleted_entry(old, NULL);
if (old && same(old, a)) {
+ old->ce_flags |= htons(CE_UPDATE);
return keep_entry(old);
}
return merged_entry(a, NULL);
next prev parent reply other threads:[~2006-05-15 7:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-14 17:43 Allow one-way tree merge to remove old files Linus Torvalds
2006-05-14 17:51 ` Junio C Hamano
2006-05-14 18:20 ` Simplify "git reset --hard" Linus Torvalds
2006-05-15 6:55 ` Junio C Hamano
2006-05-15 7:08 ` Junio C Hamano [this message]
2006-05-15 7:46 ` Junio C Hamano
2006-05-15 14:55 ` Linus Torvalds
2006-05-15 15:09 ` Linus Torvalds
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=7vwtcnvk76.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--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).