From: Petr Baudis <pasky@ucw.cz>
To: Junio C Hamano <junkio@cox.net>
Cc: torvalds@osdl.org, git@vger.kernel.org
Subject: Rename tracking
Date: Sat, 14 May 2005 17:11:59 +0200 [thread overview]
Message-ID: <20050514151159.GL3905@pasky.ji.cz> (raw)
In-Reply-To: <7vk6m260xf.fsf@assigned-by-dhcp.cox.net>
Dear diary, on Sat, May 14, 2005 at 03:39:24AM CEST, I got a letter
where Junio C Hamano <junkio@cox.net> told me that...
> Here are three patches to update diff we discussed earlier.
>
> [PATCH 1/3] Update mode-change strings in diff output.
> [PATCH 2/3] Rename git-diff-tree-helper to git-diff-helper.
> [PATCH 3/3] Rename git-diff-tree-helper to git-diff-helper (part 2).
>
> The first one is to normalize the mode bits output to be more
> machine friendly, which we discussed.
I'll postpone it for another while since there is still some discussion
about tuning the output.
> The second commit records only renames for two files and there
> is no content change. The third one is to change the Makefiles,
> documentation, and also usage string in git-diff-helper itself.
>
> I am deliverately doing the 2 and 3 in separate steps for two
> reasons. (1) to reduce the possibility of mistakes during the
> rename for myself; (2) people doing the git repository browser
> can use the commit trail for practicing their rename detection
> logic. So please keep these two steps separate when you commit.
I buy that it is nice for now to keep the changes to the renamed files
separate, but I don't see why should I withhold changing other files
in parallel with the rename.
But I think we really need explicit rename tracking, since this really
sucks. And even if someone would written a hyperintelligent content
moves heuristic tracker, it would be horribly slow on longer distances,
and more importantly it could still be confused when renaming several
similar or same files in parallel.
I'm thinking about using "\n---\n\n" in commit message to separate some
"internal data" like this. cg-log (and web interfaces and other
toolkits, if we get to agree on something common) could then by default
hide it. Below it would contain something which we could hopefully embed
in patches too (actually less work for extracting patches by cg-mkpatch
or similar tools). What do you think?
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
next prev parent reply other threads:[~2005-05-14 15:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-14 1:39 [PATCH 0/3] diff overhaul Junio C Hamano
2005-05-14 15:11 ` Petr Baudis [this message]
2005-05-14 16:05 ` Rename tracking Junio C Hamano
2005-05-14 16:21 ` Petr Baudis
2005-05-14 16:36 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050514151159.GL3905@pasky.ji.cz \
--to=pasky@ucw.cz \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=torvalds@osdl.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