From: Jonathan Nieder <jrnieder@gmail.com>
To: Marcus Comstedt <marcus@mc.pp.se>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: Fix for normalization of foreign idents
Date: Mon, 23 Aug 2010 16:35:31 -0500 [thread overview]
Message-ID: <20100823213531.GD2120@burratino> (raw)
In-Reply-To: <1282599032-11369-1-git-send-email-marcus@mc.pp.se>
Hi,
Marcus Comstedt wrote:
> $Id: blah$ --(c_t_w_t)--> $Id: blah$ --(c_t_g)--> $Id: blah$
>
> This restores correct and deterministic operation of status and
> diff, meaning that if the file hasn't actually been modified, no
> modifications are shown.
>
> As you might suggest, always keeping the foreign ident would mean it
> is never updated when you commit new versions of the file, which isn't
> really what we want. Keeping the foreign ident as long as the last
> modification to the file was made in the previous version control
> system makes perfect sense, but once we make a commit to the file
> within git, it should be replaced with a git ident.
I was with you up to here. Is commit time really the right moment
to clobber a foreign ident? I suspect it would be confusing.
It might be simpler to just never clobber a foreign ident and instead
rely on local policy (scripts, pre-commit hooks, and so on) to remove
them at the appropriate time.
next prev parent reply other threads:[~2010-08-23 21:37 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 ` Jonathan Nieder [this message]
2010-08-23 21:44 ` Fix for " 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
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=20100823213531.GD2120@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.