git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Diogo de Campos <campos@esss.com.br>
To: git@vger.kernel.org
Subject: "git log --follow filename" (with diff.renameLimit=0) not working after subtree add
Date: Wed, 7 Aug 2013 12:51:41 -0300	[thread overview]
Message-ID: <CAMebvcSGzGatdaT-iowCUMqnw0ZYM20qxDBbE7SRn7-jFXs3VA@mail.gmail.com> (raw)

Problem:

"git log --follow filename" is not working for files after a big move.


Scenario:

Just performed a "git subtree add" where big projects were moved into
another repository, and I'm not able to view history for a single
file.

Sample output:
Output after subtree add (no output)
> git log --follow --oneline file.py

Output from same command in old repository (the one that was merged
with subtree, this is the output i expect to continue having atfer a
merge)
> git log --follow --oneline file.py
cefa32b Convert doc strings to Sphinx
748b2dd Added target for C++ tests
1f2b52e Using default git_source_server for everything after moving to Stash
... [more commits]


A couple of notes:
- Made sure I used --follow
- Using options diff.renameLimit=0 and diff.renames=true
- Tried options -C and -M (even though there were no changes, should
be a 100% rename match)
- "git subtree add" was made without --squash to keep history
- "git blame file.py" works fine, detects all changes and rename history
- Commits added after the merge are tracked, but log stops at merge
- Tested with git 1.8.3.4
- This guy in StackOverflow seems to have the same problem:
http://stackoverflow.com/questions/4393527/why-might-git-log-not-show-history-for-a-moved-file-and-what-can-i-do-about-it

Relevant output for "git config -l" in repository:
core.symlinks=false
core.autocrlf=false
color.diff=auto
color.status=auto
color.branch=auto
color.interactive=true
pack.packsizelimit=2g
help.format=html
http.sslcainfo=/bin/curl-ca-bundle.crt
sendemail.smtpserver=/bin/msmtp.exe
diff.astextplain.textconv=astextplain
rebase.autosquash=true
core.packedgitlimit=128m
diff.renamelimit=0
diff.renames=true
core.repositoryformatversion=0
core.filemode=false
core.bare=false
core.logallrefupdates=true
core.symlinks=false
core.ignorecase=true
core.hidedotfiles=dotGitOnly

--

Diogo Campos

                 reply	other threads:[~2013-08-07 15:51 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=CAMebvcSGzGatdaT-iowCUMqnw0ZYM20qxDBbE7SRn7-jFXs3VA@mail.gmail.com \
    --to=campos@esss.com.br \
    --cc=git@vger.kernel.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).