From: Johannes Sixt <j.sixt@viscovery.net>
To: Michael J Gruber <git@drmicha.warpmail.net>
Cc: "Mestnik, Michael J - Eagan,
MN - Contractor" <Michael.J.Mestnik@usps.gov>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Using Format/export-subst Howto.
Date: Fri, 14 Sep 2012 17:06:54 +0200 [thread overview]
Message-ID: <5053480E.2010002@viscovery.net> (raw)
In-Reply-To: <50532B35.9050607@drmicha.warpmail.net>
Am 9/14/2012 15:03, schrieb Michael J Gruber:
> "git replaces $Id$... upon checkout. Any byte sequence that begins
> with $Id: and ends with $ in the worktree file is replaced with $Id$
> upon check-in."
>
> Now, the there are two problems after you add $Id$ and check-in
> (commit):
>
> - commit does not check out, i.e. your work-tree copy is not updated
> with expanded $Id$ - Not even "git checkout thatFile" updates your
> work-tree copy.
>
> The first one could be considered OK, but at least the second one
> seems to be a bug. Together they create the following problem: Say,
> you've corrected that problem (rm that file and checkout) and then
> update your file, add and commit. It will keeping having the old (now
> wrong) Id expansion.
If EOL conversion or a clean filter was applied during 'git add file', is
the version in the worktree suddenly wrong? Of course, not.
I would place $Id$ treatment in the same ball park and declare it as a
mistake of the editor that it did not remove the now "wrong" SHA1 from $Id:$.
> We should do something about this.
Not necessary, IMHO.
-- Hannes
next prev parent reply other threads:[~2012-09-14 15:07 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-14 12:20 Using Format/export-subst Howto Mestnik, Michael J - Eagan, MN - Contractor
2012-09-14 13:03 ` Michael J Gruber
2012-09-14 15:06 ` Johannes Sixt [this message]
2012-09-14 15:27 ` Mestnik, Michael J - Eagan, MN - Contractor
2012-09-14 15:39 ` Johannes Sixt
2012-09-14 16:05 ` Mestnik, Michael J - Eagan, MN - Contractor
2012-09-14 21:09 ` Michael J Gruber
2012-09-14 21:23 ` Junio C Hamano
2012-09-14 22:26 ` Junio C Hamano
2012-09-17 13:17 ` Michael J Gruber
2012-09-17 13:26 ` Mestnik, Michael J - Eagan, MN - Contractor
2012-09-17 20:21 ` Junio C Hamano
2012-09-18 8:24 ` Michael J Gruber
2012-09-17 12:12 ` Mestnik, Michael J - Eagan, MN - Contractor
2012-09-17 13:45 ` Michael J Gruber
2012-09-17 14:08 ` Mestnik, Michael J - Eagan, MN - Contractor
2012-09-17 14:21 ` Michael J Gruber
2012-09-17 15:52 ` Mestnik, Michael J - Eagan, MN - Contractor
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=5053480E.2010002@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=Michael.J.Mestnik@usps.gov \
--cc=git@drmicha.warpmail.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).