From: "René Scharfe" <l.s.r@web.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Cristian Le <cristian.le@mpsd.mpg.de>, git@vger.kernel.org
Subject: Re: Bug in git archive + .gitattributes + relative path
Date: Mon, 6 Mar 2023 19:28:02 +0100 [thread overview]
Message-ID: <d16c6a22-05d8-182c-97b4-53263d22eaa6@web.de> (raw)
In-Reply-To: <xmqqcz5lbxiq.fsf@gitster.g>
Am 06.03.23 um 18:27 schrieb Junio C Hamano:
> René Scharfe <l.s.r@web.de> writes:
>
>> Subject: [PATCH] archive: add --strip-components
>>
>> Allow removing leading elements from paths of archive entries. That's
>> useful when archiving sub-directories and not wanting to keep the
>> common path prefix, e.g.:
>>
>> $ git archive --strip-components=1 HEAD sha1dc | tar tf -
>> .gitattributes
>> LICENSE.txt
>> sha1.c
>> sha1.h
>> ubc_check.c
>> ubc_check.h
>>
>> The same can be achieved by specifying a tree instead of a commit and
>> a pathspec:
>>
>> $ git archive HEAD:sha1dc | tar tf -
>> .gitattributes
>> LICENSE.txt
>> sha1.c
>> sha1.h
>> ubc_check.c
>> ubc_check.h
>
> Another way I am not sure is working as designed is
>
> $ cd sha1dc && git archive HEAD . | tar tf -
> .gitattributes
> LICENSE.txt
> sha1.c
> sha1.h
> ubc_check.c
> ubc_check.hq
>
> I didn't check if the attribute look-up is done on the correct path
> or export-subst kicks in in such a use, though.
export-subst is supported in that invocation because git archive has a
commit to work with.
I can kinda see others preferring the directory prefix "sha1dc/" added
to those entries. Perhaps it depends on what git archive is supposed to
archive: A commit or the files of a commit? I'm in the latter camp, and
expect to see the same paths as given by git ls-files or git ls-tree.
But that invocation in a sub-directory probably has the same problem
with attributes as the one with a sub-tree above it, i.e. that
attributes are always looked up relative to the repository root. I
wonder if 47cfc9bd7d (attr: add flag `--source` to work with tree-ish,
2023-01-14) provided the means to fix this when it added a tree_oid
parameter to git_check_attr().
René
next prev parent reply other threads:[~2023-03-06 18:28 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-03 10:25 Bug in git archive + .gitattributes + relative path Cristian Le
2023-03-03 15:19 ` René Scharfe
2023-03-03 15:38 ` Cristian Le
2023-03-04 13:58 ` René Scharfe
2023-03-04 15:11 ` Cristian Le
2023-03-05 9:32 ` René Scharfe
2023-03-06 16:56 ` Junio C Hamano
2023-03-06 17:51 ` René Scharfe
2023-03-06 17:27 ` Junio C Hamano
2023-03-06 18:28 ` René Scharfe [this message]
2023-03-06 18:59 ` Junio C Hamano
2023-03-06 21:32 ` René Scharfe
2023-03-06 22:34 ` Junio C Hamano
2023-03-11 20:47 ` René Scharfe
2023-03-12 21:25 ` Junio C Hamano
2023-03-18 21:30 ` René Scharfe
2023-03-20 16:16 ` Junio C Hamano
2023-03-20 20:02 ` [PATCH] archive: improve support for running in a subdirectory René Scharfe
2023-03-21 22:59 ` Junio C Hamano
2023-03-24 22:26 ` René Scharfe
2023-03-24 22:27 ` [PATCH v2] archive: improve support for running in subdirectory René Scharfe
2023-03-27 16:09 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d16c6a22-05d8-182c-97b4-53263d22eaa6@web.de \
--to=l.s.r@web.de \
--cc=cristian.le@mpsd.mpg.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).