[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#8756: 23.3; vc-git.el doesn't use --follow argument in vc-git-print-

From: Steinar Bang
Subject: bug#8756: 23.3; vc-git.el doesn't use --follow argument in vc-git-print-log
Date: Sat, 11 Jan 2014 15:15:14 +0100
User-agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3 (gnu/linux)

>>>>> Dan Nicolaescu <address@hidden>:

> The simple fix applied was suggested with the bug report.  It is not
> enough to make it fully work, things like annotate, diff, etc do not
> work...


To summarize: with --follow in place, what's listed in the log is the
complete history, but annotate, and find files won't work past renames,
and diffs reports "no diffs" when there should have been one (past

To summarize my experiments further down in the bug report thread: if
you do  
 git diff -M sha1a sha1b -- path-of-file-in-sha1a path-of-file-in-sha1b
you get a result that is the diff of the two files.

Here sha1a is a sha1 in "git log --follow path-of-file" that refers to a
point in history before moving a file, and path-of-file-in-sha1a is the
path to the file at that time in history.  And sha1b and
path-of-file-in-sha1b refers to a point in time where the file has a
different name or location.

To get the sha1/path infomation one can do the command
 git log --follow --name-only --pretty=oneline 
and then parse out the sha1/path pairs.

Note: this "git log" has to be done in addition to the displayed "git
log".  This command is not for display, it is just to get the sha1/path

I have created an example repo that contains some renames, moves, and
plain changes, at: https://github.com/steinarb/renametest.git

Here is an example of a diff in that repository (in this case a file
that has been renamed once, and then renamed file has been moved to a
different location):

address@hidden:~/git/renametest$ git diff -M 
09d1bf6aa4dcd20dd36ca7668b75809e794428e0 -- hoved.txt application/main.txt
diff --git a/hoved.txt b/application/main.txt
similarity index 50%
rename from hoved.txt
rename to application/main.txt
index 9a57969..7f5e5a6 100644
--- a/hoved.txt
+++ b/application/main.txt
@@ -1,5 +1,6 @@
 Hello world!
-Version 1.0
-Feature1 implementation
+Version 2.0
 Feature2 implementation
 Feature3 implementation
+Feature4 implementation
+Feature4 implementation

Here is an example of the command to get the sha1/path pairs:
address@hidden:~/git/renametest$ git log --follow --name-only --pretty=oneline 
09d1bf6aa4dcd20dd36ca7668b75809e794428e0 Bumped the version number.
313aa2f727fefc9e50354380cb9fb3a70401b5f3 Moved a single file to a different 
9b47cdca956a59b4582c67d24f9474a576aff7b9 Changes to two files
dd99483cda11b4ab040135767655c07c5cf07efb Removed a line.
2b0f570422db1e0fac39697d908b31eb70e895f5 Renamed a file and changed the README 
in the same commit
b35723cfbc91a3108469091c8c77ee91107e1ab8 Added a new feature.
e5984c6a9e8e015dc521fb6a1756a88d5ffd676d Introduced a new file

reply via email to

[Prev in Thread] Current Thread [Next in Thread]