From: Stefan Beller <sbeller@google.com>
To: Harry Putnam <reader@newsguy.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Not understanding with git wants to copy one file to another
Date: Thu, 10 Aug 2017 10:36:44 -0700 [thread overview]
Message-ID: <CAGZ79kbgb2P7KT_b9xuMj1pN1+jsPfH7YSJNDyDB5dY3cwXCQg@mail.gmail.com> (raw)
In-Reply-To: <87mv7773tp.fsf@local.lan>
On Thu, Aug 10, 2017 at 10:03 AM, Harry Putnam <reader@newsguy.com> wrote:
> I ran into a line in git commit ouput I had not see before
>
> #copied: d0/etc/hosts -> misc/old-readerHOSTvcs-files/etc/hosts
>
> So googling I learned that this might happen if git thinks the two
> files are the same.
>
> I was pretty sure they were not the same so checked them>
>
> <inside git repo>
>
> diff d0/etc/host misc/old-readerHOSTvcs-files/etc/hosts
>
> The output is a bit long but shows them being quite different.
>
> Some 2 dozen or so lines that dramatically differ.
>
> Here are two that are at least kind of similar but would never be seen
> as the same:
>
> < 192.168.1.43 m2.local.lan m2 # 00-90-F5-A1-F9-E5
>> 192.168.1.43 m2.local.lan m2 # win 7
>
> Not to mention they are quite different lines as well.
>
> So what is going on and what should I be looking at?
The diff machinery has a threshold for when it assumes
a copy/move of a file. (e.g. "A file is assumed copied when
at least 55% of lines are equal")
https://git-scm.com/docs/git-diff
See -C and -M option.
git-status seems to use this machinery as well, but does
not expose the options?
next prev parent reply other threads:[~2017-08-10 17:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-10 17:03 Not understanding with git wants to copy one file to another Harry Putnam
2017-08-10 17:36 ` Stefan Beller [this message]
2017-08-10 18:18 ` Harry Putnam
2017-08-10 18:47 ` Stefan Beller
2017-08-11 20:41 ` Harry Putnam
2017-08-14 18:07 ` Stefan Beller
2017-08-14 19:21 ` 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
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=CAGZ79kbgb2P7KT_b9xuMj1pN1+jsPfH7YSJNDyDB5dY3cwXCQg@mail.gmail.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=reader@newsguy.com \
/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).