Re: [PATCH] Resurrect diff-tree-helper -R

From: Petr Baudis <pasky@ucw.cz>
Date: May 13, 2005, 22:45 UTC
Message-ID: <20050513224529.GF32232@pasky.ji.cz>
In-Reply-To: <Pine.LNX.4.58.0504301805300.2296@ppc970.osdl.org>

Dear diary, on Sun, May 01, 2005 at 03:09:53AM CEST, I got a letter where Linus Torvalds <torvalds@osdl.org> told me that...

Show 25 quoted lines

> 
> 
> On Sat, 30 Apr 2005, Junio C Hamano wrote:
> >
> > Diff-tree-helper take two patch inadvertently dropped the
> > support of -R option
> 
> Talking about the diffs, I'm beginning to hate those "mode" things.
> 
> Not only do they screw up diffstat (big deal), but they are pointless, 
> since 99.9% of the time the mode stays the same.
> 
> So it would be much nicer (I think) if mode changes are handled 
> separately, with a simple separate line before the diff saying
> 
> 	"Mode change: %o->%o %s", oldmode, newmode, path
> 
> and not mess up the diff header. That way, you only see it when it
> actually makes any difference, and it's more readable both for humans
> _and_ machines as a result.
> 
> Normal "patch" will just ignore the extra lines before the diff anyway, so 
> it won't matter there.
> 
> Comments?

Sorry for replying after so much time, it looks like I missed this and got here only after checking what change removed the mode: bits...

I'd personally prefer something like

	@.Mode change:

that is, using a '@.' prefix for those. It seems to be unique enough and '@' is one of the four magic characters prefixing diff lines. Just using the plain string seems too volatile, and I need to grep all the interesting bits out of the diff file. This is because patch can otherwise complain "only garbage found in the patch" when processing the diff, which confuses my users greatly.

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