From: Junio C Hamano <gitster@pobox.com>
To: "Michael P. Soulier" <msoulier@digitaltorque.ca>
Cc: git@vger.kernel.org
Subject: Re: git confused by rename
Date: Fri, 10 Oct 2008 08:44:08 -0700 [thread overview]
Message-ID: <7vabdcmp4n.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <fb6605670810100741k7cff25c7y4df66834cf7482a0@mail.gmail.com> (Michael P. Soulier's message of "Fri, 10 Oct 2008 10:41:54 -0400")
"Michael P. Soulier" <msoulier@digitaltorque.ca> writes:
> # renamed: templates/scrc/index.html -> templates/scrc/cres_taps.html
> # modified: templates/scrc/index.html
>
> Looking at the last two lines here, there is obviously an issue.
I am puzzled.
Looking at wt-status.c "renamed: A -> B" will be shown only when A and B
are similar enough *and* there is no A remaining in the final result, and
in such a case, "modified: A" should not be shown. Because git does not
care how you created B (IOW, it does not matter if B was typed from
scratch with copying and pasting, or created by copying and editing), the
"renamed: A -> B" entry itself is not surprising nor look like a bug at
all, but its presense at the same time as "modified: A" does feel very
fishy.
next prev parent reply other threads:[~2008-10-10 15:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-10 14:41 git confused by rename Michael P. Soulier
2008-10-10 15:44 ` Junio C Hamano [this message]
2008-10-10 15:54 ` Junio C Hamano
2008-10-10 16:19 ` Björn Steinbrink
2008-10-10 22:08 ` Michael P. Soulier
2008-10-10 16:08 ` [PATCH] git-status: Detect copies as well as renames Björn Steinbrink
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=7vabdcmp4n.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=msoulier@digitaltorque.ca \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox