From: Jan Hudec <bulb@ucw.cz>
To: Sergio Callegari <scallegari@arces.unibo.it>
Cc: git@vger.kernel.org
Subject: Re: .gitignore, .gitattributes, .gitmodules, .gitprecious?, .gitacls? etc.
Date: Tue, 4 Sep 2007 23:03:49 +0200 [thread overview]
Message-ID: <20070904210349.GE3786@efreet.light.src> (raw)
In-Reply-To: <loom.20070827T185519-641@post.gmane.org>
[-- Attachment #1: Type: text/plain, Size: 2425 bytes --]
On Mon, Aug 27, 2007 at 17:07:34 +0000, Sergio Callegari wrote:
> David Kastrup <dak <at> gnu.org> writes:
>
> >
> > Sergio Callegari <scallegari <at> arces.unibo.it> writes:
> >
> > > Couldn't all this directory/ownership/permission tracing be easily
> > > done by using hooks? E.g. Having a pre-status and pre-commit hook
> > > one could fire up a program/script to collect all the extra info he
> > > wants to trace and store it somewhere (typically in some traced
> > > file). The other way round one could have a post-checkout hook and
> > > he could arrange it to fire up some program to look into the
> > > extra-info file to set up all the meta-data he wants.
> > >
> > > This would be very flexible and would permit to manage absolutely
> > > /any/ kind of the metadata leaving absolute freedom about how to do
> > > so.
> > >
> > > Am I missing something here?
> >
> > Merging.
> >
>
> Sorry, maybe I am really missing something, since merging does not look to me
> as an issue.
>
> Why cannot git simply do the merging in the working tree as it normally
> does, including merging of the traced metadata file generated by the metadata
> helpers invoked via the hooks?
> Only, again more hooks are needed and likely a post-merge hook, so that at
> the end of the merge, the metadata can be applied.
>
> Only, to have things going on smoothly, one should be so wise to assure that
> the metadata helpers save metadata as nice, sorted text files in order to
> minimize the burden of manual intervention if there are conflicts in
> metadata merging.
The post-checkout (no need for post-merge -- after in-index merge is done,
the files are checked out to worktree, so post-checkout would run anyway)
could actually apply any custom merge strategy required to avoid/clean up
spurious conflicts in the metadata file (eg. adding two files that go after
each other would be a textual conflict). The relevant versions are stored in
index stages at that point.
> BTW. Having a post-checkout hook could also help getting rid of unwanted
> empty directories, couldn't it?
Probably not. I would imagine it would actually only run for the files being
checked out -- and there is nothing checked out in empty directories. (Well,
it would run once or once per directory with list of checked out files on
standard input).
--
Jan 'Bulb' Hudec <bulb@ucw.cz>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
prev parent reply other threads:[~2007-09-04 21:03 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-26 2:59 .gitignore, .gitattributes, .gitmodules, .gitprecious?, .gitacls? etc Dmitry Kakurin
2007-08-26 4:37 ` Junio C Hamano
2007-08-26 5:17 ` Dmitry Kakurin
2007-08-26 5:33 ` Junio C Hamano
2007-08-26 6:36 ` Dmitry Kakurin
2007-08-26 7:28 ` Junio C Hamano
2007-08-26 8:02 ` Dmitry Kakurin
2007-08-26 10:06 ` Petr Baudis
[not found] ` <4C603F7C51884DF8AFAEC3F6E263798D@ntdev.corp.microsoft.com>
2007-08-27 20:27 ` .gitignore, .gitattributes, .gitmodules, .gitprecious?,.gitacls? etc Dmitry Kakurin
[not found] ` <Pine.LNX.4.64.0708280945350.28586@racer.site>
2007-09-04 20:23 ` Jan Hudec
2007-09-05 8:06 ` Dmitry Kakurin
2007-09-05 8:14 ` Junio C Hamano
2007-09-05 8:31 ` Dmitry Kakurin
2007-09-05 18:38 ` Jan Hudec
2007-08-27 2:51 ` .gitignore, .gitattributes, .gitmodules, .gitprecious?, .gitacls? etc Sam Vilain
2007-08-27 5:52 ` David Kastrup
2007-08-27 10:56 ` Sam Vilain
2007-08-27 11:26 ` David Kastrup
2007-08-27 11:30 ` Johannes Schindelin
[not found] ` <46D33A15.1000003@vilain.net>
[not found] ` <Pine.LNX.4.64.0708280942360.28586@racer.site>
[not found] ` <46D4A4F8.9040004@vilain.net>
[not found] ` <Pine.LNX.4.64.0708290007020.28586@racer.site>
2007-09-04 20:49 ` Jan Hudec
2007-08-26 15:05 ` Johannes Schindelin
2007-08-27 11:35 ` martin f krafft
2007-08-27 15:34 ` Sergio Callegari
2007-08-27 15:48 ` David Kastrup
2007-08-27 16:54 ` Petr Baudis
2007-08-27 17:22 ` Sergio Callegari
2007-08-27 17:07 ` Sergio Callegari
2007-09-04 21:03 ` Jan Hudec [this message]
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=20070904210349.GE3786@efreet.light.src \
--to=bulb@ucw.cz \
--cc=git@vger.kernel.org \
--cc=scallegari@arces.unibo.it \
/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).