All of lore.kernel.org
 help / color / mirror / Atom feed
From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH 3/8] archive: add a failure test wrt .gitattributes   misreading
Date: Mon, 13 Apr 2009 15:56:27 +0200	[thread overview]
Message-ID: <49E3448B.8010602@lsrfire.ath.cx> (raw)
In-Reply-To: <7vab6rkl5f.fsf@gitster.siamese.dyndns.org>

Junio C Hamano schrieb:
> Nguyễn Thái Ngọc Duy  <pclouds@gmail.com> writes:
> 
>> "git archive" is used to create archives from a tree (or commit), so
>> it should not consult any .gitattributes files on working directory.
>>
>> It currently does,...
> 
> ...which _might_ be actively used as a _feature_ by people; I do not think
> it is a bad idea to have a mode of operation where it solely works with
> in-tree attributes ignoring the work tree ones, and I suspect we probably
> would want to make that the default, but "so it should not" is probably a
> bit too strong.
> 
> For example, an older version may record $Id$ with keyword expansion set
> in its in-tree .gitattributes, and you later found it to be a mistake and
> have removed it in the current version.  Re-exporting an older version
> with the current code wouldn't have $Id$ expanded, but with your patch it
> will.
> 
> A stronger example would be crlf conversion, I suppose, but the same "with
> the current code we can fix it up but after this patch we can't" worry
> applies.
> 
> So perhaps you may want to resurrect the current behaviour with a new
> option --fix-attributes, whose description would be "normally the command
> takes attributes settings from the tree being exported, but .gitattributes
> files in it may record wrong attributes you may want to fix while
> exporting.  With this option, corresponding .gitattributes files in the
> work tree will override the in-tree .gitattributes" or something like
> that.

Hmm, "fix" implies that something is broken without this option, which
is not necessarily the case.  A purely descriptive name like
--worktree-attributes fits better IMHO.

Also, the last sentence of the description may be taken to imply a
mixing of attributes from work tree and exported tree is done, which is
not the case with the patch from series 2 (and shouldn't be).  Perhaps:
"With this option, .gitattributes files are read from the work tree
instead of from the exported tree."

René

  reply	other threads:[~2009-04-13 13:58 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-08 10:05 [PATCH 0/8] support "in-tree attributes" for git-archive Nguyễn Thái Ngọc Duy
2009-04-08 10:05 ` [PATCH 1/8] archive: add shortcuts for --format and --prefix Nguyễn Thái Ngọc Duy
2009-04-08 10:05   ` [PATCH 2/8] move prune_cache() to git lib Nguyễn Thái Ngọc Duy
2009-04-08 10:05     ` [PATCH 3/8] archive: add a failure test wrt .gitattributes misreading Nguyễn Thái Ngọc Duy
2009-04-08 10:05       ` [PATCH 4/8] archive: add tests for directory selection Nguyễn Thái Ngọc Duy
2009-04-08 10:05         ` [PATCH 5/8] attr: add GIT_ATTR_INDEX "direction" Nguyễn Thái Ngọc Duy
2009-04-08 10:05           ` [PATCH 6/8] archive: use index instead of parsing tree directly Nguyễn Thái Ngọc Duy
2009-04-08 10:05             ` [PATCH 7/8] archive: disregard .gitattributes on working directory Nguyễn Thái Ngọc Duy
2009-04-08 10:05               ` [PATCH 8/8] archive: support creating archives from index Nguyễn Thái Ngọc Duy
2009-04-08 20:48                 ` René Scharfe
2009-04-08 19:20               ` [PATCH 7/8] archive: disregard .gitattributes on working directory Junio C Hamano
2009-04-08 19:20             ` [PATCH 6/8] archive: use index instead of parsing tree directly Junio C Hamano
2009-04-08 20:39             ` René Scharfe
2009-04-08 21:02             ` René Scharfe
2009-04-08 19:52         ` [PATCH 4/8] archive: add tests for directory selection René Scharfe
2009-04-08 19:20       ` [PATCH 3/8] archive: add a failure test wrt .gitattributes misreading Junio C Hamano
2009-04-13 13:56         ` René Scharfe [this message]
2009-04-14  6:41           ` Nguyen Thai Ngoc Duy
2009-04-14 20:12             ` René Scharfe
2009-04-16  8:22           ` Junio C Hamano
2009-04-17 20:15             ` René Scharfe
2009-04-18  1:33               ` Junio C Hamano
2009-04-08 19:19     ` [PATCH 2/8] move prune_cache() to git lib Junio C Hamano
2009-04-08 19:51   ` [PATCH 1/8] archive: add shortcuts for --format and --prefix René Scharfe

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=49E3448B.8010602@lsrfire.ath.cx \
    --to=rene.scharfe@lsrfire.ath.cx \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pclouds@gmail.com \
    /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.