From: Junio C Hamano <gitster@pobox.com>
To: Marcus Comstedt <marcus@mc.pp.se>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 1/2] convert: fix normalization of foreign idents
Date: Thu, 09 Sep 2010 17:26:21 -0700 [thread overview]
Message-ID: <7vmxrqjvf6.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: E1Ot4NP-0002xn-Nc@chiyo.mc.pp.se
Marcus Comstedt <marcus@mc.pp.se> writes:
> Since ident_to_worktree() does not touch $Id$ tags which contain
> foreign expansions in the repository, make sure that ident_to_git()
> does not either. This fixes the problem that such files show
> spurious modification upon checkout.
>
> There is however one case where we want ident_to_git() to normalize
> the tag to $Id$ despite the asymmetry: When committing a modification
> to a file which has a foreign ident, the foreign ident should be
> replaced with a regular git ident. Thus, add a new parameter to
> convert_to_git() that indicates if we want the foreign idents
> normalized after all.
Would it be possible that the real culprit is that ident_to_worktree()
does not always touch $Id$ in the first place? Why isn't "$Id: garbage$"
first cleaned and then smudged upon checkout?
It also smells wrong that this "sometimes we convert, sometimes we don't"
is a special case for "$Id$" and for no other conversion. Why don't
smudge/clean filter or CRLF conversion have the same issue that can be
solved with the same approach as this patch takes?
next prev parent reply other threads:[~2010-09-10 0:26 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-23 21:30 Fix for normalization of foreign idents Marcus Comstedt
2010-08-23 21:30 ` [PATCH] convert: fix " Marcus Comstedt
2010-08-23 21:35 ` Fix for " Jonathan Nieder
2010-08-23 21:44 ` Marcus Comstedt
2010-08-23 22:33 ` Jonathan Nieder
2010-08-23 23:46 ` Junio C Hamano
2010-08-24 7:23 ` Marcus Comstedt
2010-09-06 9:42 ` Marcus Comstedt
2010-09-06 21:07 ` Jonathan Nieder
2010-09-07 19:37 ` Marcus Comstedt
2010-08-23 7:05 ` [PATCH v2 1/2] convert: fix " Marcus Comstedt
2010-09-10 0:26 ` Junio C Hamano [this message]
2010-09-12 21:01 ` Marcus Comstedt
2010-09-12 21:44 ` Junio C Hamano
2010-09-12 22:06 ` Marcus Comstedt
2010-09-13 22:00 ` [PATCH] convert: generalize checksafe parameter Marcus Comstedt
2010-09-07 19:16 ` [PATCH v2 2/2] t0021: test checkout and commit of foreign idents Marcus Comstedt
2010-09-07 20:00 ` [PATCH v2 0/2] fix normalization of foreign idents (now with test cases) Marcus Comstedt
2010-09-08 4:32 ` Fix for normalization of foreign idents Jonathan Nieder
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=7vmxrqjvf6.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=marcus@mc.pp.se \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.