git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Fix for normalization of foreign idents

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Aug 23, 2010, 21:35 UTC
Message-ID
<20100823213531.GD2120@burratino>
In-Reply-To
<1282599032-11369-1-git-send-email-marcus@mc.pp.se>
Hi,
Marcus Comstedt wrote:
Show 12 quoted lines
>   $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.

Previous: Marcus ComstedtNext: Marcus Comstedt
Message 3 of 19 in “Fix for normalization of foreign idents”
  1. Marcus ComstedtAug 23, 2010
  2. convert: fix normalization of foreign identsMarcus Comstedt, Aug 23, 2010
  3. Jonathan NiederAug 23, 2010
  4. Marcus ComstedtAug 23, 2010
  5. Jonathan NiederAug 23, 2010
  6. Junio C HamanoAug 23, 2010
  7. Marcus ComstedtAug 24, 2010
  8. Marcus ComstedtSep 6, 2010
  9. Jonathan NiederSep 6, 2010
  10. Marcus ComstedtSep 7, 2010
  11. 1/2 convert: fix normalization of foreign identsMarcus Comstedt, Aug 23, 2010
  12. Junio C HamanoSep 10, 2010
  13. Marcus ComstedtSep 12, 2010
  14. Junio C HamanoSep 12, 2010
  15. Marcus ComstedtSep 12, 2010
  16. convert: generalize checksafe parameterMarcus Comstedt, Sep 13, 2010
  17. 2/2 t0021: test checkout and commit of foreign identsMarcus Comstedt, Sep 7, 2010
  18. 0/2 fix normalization of foreign idents (now with test cases)Marcus Comstedt, Sep 7, 2010
  19. Jonathan NiederSep 8, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.