git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Git and cogito uses different exclude files
@ 2005-09-16  7:49 Pierre Ossman
  2005-09-16  8:34 ` Catalin Marinas
  0 siblings, 1 reply; 6+ messages in thread
From: Pierre Ossman @ 2005-09-16  7:49 UTC (permalink / raw)
  To: git

This has probably been pointed out previously, but I couldn't seem to
find it in the archives.

'git status' and 'cg-status'/'stg status' uses different locations for
the exclude files. git expects .git/info/exclude and cogito and stgit
expects .git/exclude. This is easily solved by a symlink but it could be
nice if common files have a single correct location. :)

Rgds
Pierre

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Git and cogito uses different exclude files
  2005-09-16  7:49 Git and cogito uses different exclude files Pierre Ossman
@ 2005-09-16  8:34 ` Catalin Marinas
  2005-09-16 10:44   ` Petr Baudis
  0 siblings, 1 reply; 6+ messages in thread
From: Catalin Marinas @ 2005-09-16  8:34 UTC (permalink / raw)
  To: Pierre Ossman; +Cc: git

Pierre Ossman <drzeus-list@drzeus.cx> wrote:
> 'git status' and 'cg-status'/'stg status' uses different locations for
> the exclude files. git expects .git/info/exclude and cogito and stgit
> expects .git/exclude. This is easily solved by a symlink but it could be
> nice if common files have a single correct location. :)

The latest StGIT snapshot uses .git/info/exclude. Probably next week I
will make a new StGIT release.

-- 
Catalin

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Git and cogito uses different exclude files
  2005-09-16  8:34 ` Catalin Marinas
@ 2005-09-16 10:44   ` Petr Baudis
  2005-09-16 16:43     ` Junio C Hamano
  0 siblings, 1 reply; 6+ messages in thread
From: Petr Baudis @ 2005-09-16 10:44 UTC (permalink / raw)
  To: Catalin Marinas; +Cc: Pierre Ossman, git

Dear diary, on Fri, Sep 16, 2005 at 10:34:19AM CEST, I got a letter
where Catalin Marinas <catalin.marinas@gmail.com> told me that...
> Pierre Ossman <drzeus-list@drzeus.cx> wrote:
> > 'git status' and 'cg-status'/'stg status' uses different locations for
> > the exclude files. git expects .git/info/exclude and cogito and stgit
> > expects .git/exclude. This is easily solved by a symlink but it could be
> > nice if common files have a single correct location. :)
> 
> The latest StGIT snapshot uses .git/info/exclude. Probably next week I
> will make a new StGIT release.

So does Cogito now. ;-) It still looks at .git/exclude as well and gives
warning if it exists.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
If you want the holes in your knowledge showing up try teaching
someone.  -- Alan Cox

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Git and cogito uses different exclude files
  2005-09-16 10:44   ` Petr Baudis
@ 2005-09-16 16:43     ` Junio C Hamano
  2005-09-17  5:50       ` Petr Baudis
  0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2005-09-16 16:43 UTC (permalink / raw)
  To: Petr Baudis, Catalin Marinas; +Cc: Pierre Ossman, git

Petr Baudis <pasky@suse.cz> writes:

>> The latest StGIT snapshot uses .git/info/exclude. Probably next week I
>> will make a new StGIT release.
>
> So does Cogito now. ;-) It still looks at .git/exclude as well and gives
> warning if it exists.

Late last night I could not find in the list archive the "list
consensus" I used to justify what 'git-status' does in this log
message:

    Message-ID: <7vfysw89do.fsf@assigned-by-dhcp.cox.net>
    From: Junio C Hamano <junkio@cox.net>
    Subject: [PATCH] Teach git-status-script about git-ls-files --others
    Date: Fri, 26 Aug 2005 18:18:59 -0700

    When there is non-empty $GIT_DIR/info/exclude file, use it along
    with .gitignore per-directory exclude pattern files (which was
    a convention agreed on the list while ago and is compatible with
    Cogito) to generate a list of ignored files as well.

    Signed-off-by: Junio C Hamano <junkio@cox.net>

I do remember checking Cogito and StGIT and making sure the use
of .gitignore is consistent with you two, but I do not remember
if we had consensus on info/exclude now.  It could be that I was
just hallucinating back then and ended up forcing this change
onto you and your users by mistake in this round.

Anyway, thanks both.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Git and cogito uses different exclude files
  2005-09-16 16:43     ` Junio C Hamano
@ 2005-09-17  5:50       ` Petr Baudis
  2005-09-17  6:45         ` Sam Ravnborg
  0 siblings, 1 reply; 6+ messages in thread
From: Petr Baudis @ 2005-09-17  5:50 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Catalin Marinas, Pierre Ossman, git

Dear diary, on Fri, Sep 16, 2005 at 06:43:27PM CEST, I got a letter
where Junio C Hamano <junkio@cox.net> told me that...
> Petr Baudis <pasky@suse.cz> writes:
> 
> >> The latest StGIT snapshot uses .git/info/exclude. Probably next week I
> >> will make a new StGIT release.
> >
> > So does Cogito now. ;-) It still looks at .git/exclude as well and gives
> > warning if it exists.
> 
> Late last night I could not find in the list archive the "list
> consensus" I used to justify what 'git-status' does in this log
> message:
> 
>     Message-ID: <7vfysw89do.fsf@assigned-by-dhcp.cox.net>
>     From: Junio C Hamano <junkio@cox.net>
>     Subject: [PATCH] Teach git-status-script about git-ls-files --others
>     Date: Fri, 26 Aug 2005 18:18:59 -0700
> 
>     When there is non-empty $GIT_DIR/info/exclude file, use it along
>     with .gitignore per-directory exclude pattern files (which was
>     a convention agreed on the list while ago and is compatible with
>     Cogito) to generate a list of ignored files as well.
> 
>     Signed-off-by: Junio C Hamano <junkio@cox.net>
> 
> I do remember checking Cogito and StGIT and making sure the use
> of .gitignore is consistent with you two, but I do not remember
> if we had consensus on info/exclude now.  It could be that I was
> just hallucinating back then and ended up forcing this change
> onto you and your users by mistake in this round.

I'm too tired to search now (just after a night bus trip from Denmark -
actually, one of the bus drivers looked exactly like Linus, perhaps his
twin works for a Czech bus company?), but I believe we actually did
agree on using .git/info/exclude instead of .git/exclude in some old
now-forgotten thread, or we are having the same hallucinations.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
If you want the holes in your knowledge showing up try teaching
someone.  -- Alan Cox

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Git and cogito uses different exclude files
  2005-09-17  5:50       ` Petr Baudis
@ 2005-09-17  6:45         ` Sam Ravnborg
  0 siblings, 0 replies; 6+ messages in thread
From: Sam Ravnborg @ 2005-09-17  6:45 UTC (permalink / raw)
  To: Petr Baudis; +Cc: Junio C Hamano, Catalin Marinas, Pierre Ossman, git

> I'm too tired to search now (just after a night bus trip from Denmark -
Tell me next time and I will be happy to give a damn good danish beer!

	Sam

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2005-09-17  6:44 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-09-16  7:49 Git and cogito uses different exclude files Pierre Ossman
2005-09-16  8:34 ` Catalin Marinas
2005-09-16 10:44   ` Petr Baudis
2005-09-16 16:43     ` Junio C Hamano
2005-09-17  5:50       ` Petr Baudis
2005-09-17  6:45         ` Sam Ravnborg

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).