From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: Re: Allow one-way tree merge to remove old files
Date: Sun, 14 May 2006 10:51:19 -0700 [thread overview]
Message-ID: <7vy7x41omg.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.64.0605141040210.3866@g5.osdl.org> (Linus Torvalds's message of "Sun, 14 May 2006 10:43:50 -0700 (PDT)")
Linus Torvalds <torvalds@osdl.org> writes:
> For some random reason (probably just because nobody noticed), the one-way
> merge strategy didn't mark deleted files as deleted, so if you used
>
> git-read-tree -m -u <newtree>
>
> it would update the files that got changed in the index, but it would not
> delete the files that got deleted.
Good catch. I think it is a leftover from the days we did not
have -u there; returning 0 was a way to say "there is no cache
entry resulting from this round of path-merge".
next prev parent reply other threads:[~2006-05-14 17:51 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 [this message]
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
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=7vy7x41omg.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).