From: Johannes Sixt <j.sixt@viscovery.net>
To: git@vger.kernel.org
Subject: How to verify that lines were only moved, not edited?
Date: Wed, 19 Oct 2011 16:34:20 +0200 [thread overview]
Message-ID: <4E9EDFEC.3040009@viscovery.net> (raw)
I thought there was a way to use git-blame to find out whether a change
only shuffled lines, but otherwise did not modify them. I tried "git blame
-M -- the/file", but it does not work as expected, neither with a toy file
nor with a 5000+ lines file (with 55 lines moved).
git init
echo A > foo
echo B >> foo
git add foo
git commit -m initial
echo B > foo
echo A >> foo
git commit -a -m swapped
The results are:
$ git blame -M -s -- foo
^e3abca2 1) B
6189cb46 2) A
I would have expected:
^e3abca2 1) B
^e3abca2 2) A
Oh, look! This produces the expected result:
$ git blame -M1 -s -- foo
while this produces the same as with just -M:
$ git blame -M2 -s -- foo
But neither helps with my 5000+ lines file. Does it mean that the lines
were changed? But I'm sure they were just moved! Please help!
-- Hannes
next reply other threads:[~2011-10-19 14:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-19 14:34 Johannes Sixt [this message]
2011-10-19 16:33 ` How to verify that lines were only moved, not edited? Jeff King
2011-10-20 6:20 ` Johannes Sixt
2011-10-19 17:07 ` Junio C Hamano
2011-10-20 6:25 ` Johannes Sixt
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=4E9EDFEC.3040009@viscovery.net \
--to=j.sixt@viscovery.net \
--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).