From: Junio C Hamano <gitster@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: david@lang.hm, git@vger.kernel.org, rob@landley.net
Subject: Re: possible bug in git apply?
Date: Sat, 04 Aug 2007 22:11:19 -0700 [thread overview]
Message-ID: <7vvebuh8g8.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <alpine.LFD.0.999.0708042141510.5037@woody.linux-foundation.org> (Linus Torvalds's message of "Sat, 4 Aug 2007 21:48:08 -0700 (PDT)")
Linus Torvalds <torvalds@linux-foundation.org> writes:
> It should. I thought we did that, but maybe there's some bug there.
>
> See "remove_file()" in builtin-apply.c.
>
> But yeah, it seems that the file *rename* ends up not triggering that
> logic! Very annoying.
>
> Does this fix it? Totally untested, but it _looks_ obvious enough..
That would regress the fix made in aea19457, I am afraid. If
you are in a subdirectory and the rename patch moves away the
last file in your current directory, the shell session you ran
the git-apply from will end up in an unlinked directory.
Maybe that is a pilot error, and we can revert aea19457
altogether?
next prev parent reply other threads:[~2007-08-05 5:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-04 19:45 possible bug in git apply? david
2007-08-04 20:00 ` Junio C Hamano
2007-08-04 20:08 ` David Kastrup
2007-08-05 4:48 ` Linus Torvalds
2007-08-05 4:53 ` Linus Torvalds
2007-08-05 5:11 ` Junio C Hamano [this message]
2007-08-05 7:55 ` David Kastrup
2007-08-05 16:59 ` Linus Torvalds
2007-08-05 17:53 ` David Kastrup
2007-08-05 18:18 ` Linus Torvalds
2007-08-05 18:50 ` David Kastrup
2007-08-05 19:20 ` Linus Torvalds
2007-08-05 19:37 ` David Kastrup
2007-08-06 8:29 ` Junio C Hamano
2007-08-06 9:37 ` Junio C Hamano
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=7vvebuh8g8.fsf@assigned-by-dhcp.cox.net \
--to=gitster@pobox.com \
--cc=david@lang.hm \
--cc=git@vger.kernel.org \
--cc=rob@landley.net \
--cc=torvalds@linux-foundation.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.