From: Tarmigan <tarmigan+git@gmail.com>
To: "Kai Blin" <kai@samba.org>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Jakub Narebski" <jnareb@gmail.com>
Subject: Re: Directory renames without breaking git log.
Date: Thu, 4 Sep 2008 11:35:45 -0700 [thread overview]
Message-ID: <905315640809041135m4026cf90h7f506bb3d295b09a@mail.gmail.com> (raw)
In-Reply-To: <200809040853.36433.kai@samba.org>
(you're probably better off asking on the whole list, as I don't know much)
On Wed, Sep 3, 2008 at 11:53 PM, Kai Blin <kai@samba.org> wrote:
> On Thursday 04 September 2008 02:16:24 you wrote:
>> On Wed, Sep 3, 2008 at 2:38 PM, Kai Blin <kai@samba.org> wrote:
>> > Unfortunately, the directories are big enough that git log stops to track
>> > the renamed files, so e.g. git log ./samba3 does not show the samba3
>> > history. The history is not lost, of course, but it's way less intuitive
>> > to get it.
>>
>> You can try setting diff.renamelimit to 0 in your ~/.gitconfig. See
>> Linus's email here for a similar situation in the kernel:
>> http://lwn.net/Articles/292948/
>
> That doesn't seem to fix "git log path/to/file" cases. The really interesting
> part is that if I try git log --follow -M -C path/to/file, I don't get any
> history at all. (--follow is the culprit, if I remove that I at least get the
> merge commit)
OK, I actually tried with your example, and see what you mean. It
looks like follow does not work with this case. See
http://permalink.gmane.org/gmane.comp.version-control.git/85766
for an illustration of --follow not working with the subtree merge
strategy, which as far as I can tell is pretty much the same as this
case. Also it sounds like follow only works with single files, and
not directories:
http://kerneltrap.org/mailarchive/git/2008/5/4/1714694
Why these do not work is way beyond my git knowledge. As far as I
know (which is very little), follow could work for these cases, but it
currently does not.
> git blame still works, and git log --sparse path/to/file works, of
> course. --sparse makes giving a path a bit pointless, of course, but we
> probably can live with that for time being. I'm still open for suggestions,
> of course. :)
Glad that git blame works. If you haven't already, you should also
try git gui blame too for better interactivity.
Thanks,
Tarmigan
next prev parent reply other threads:[~2008-09-04 18:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-03 21:38 Directory renames without breaking git log Kai Blin
2008-09-04 0:16 ` Tarmigan
[not found] ` <200809040853.36433.kai@samba.org>
2008-09-04 18:35 ` Tarmigan [this message]
2008-09-04 19:45 ` Kai Blin
2008-09-04 19:49 ` Junio C Hamano
2008-09-04 20:52 ` Kai Blin
2008-09-04 22:06 ` Junio C Hamano
2008-09-04 20:41 ` Jakub Narebski
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=905315640809041135m4026cf90h7f506bb3d295b09a@mail.gmail.com \
--to=tarmigan+git@gmail.com \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=kai@samba.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 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 NNTP newsgroup(s).