unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* .deps/ and .gitignore?
@ 2017-07-29  7:08 Paul Eggert
  2017-07-29  7:44 ` Eli Zaretskii
  2017-07-29  8:00 ` martin rudalics
  0 siblings, 2 replies; 6+ messages in thread
From: Paul Eggert @ 2017-07-29  7:08 UTC (permalink / raw)
  To: Eli Zaretskii; +Cc: Emacs Development

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

Was the attached patch actually needed? As far as I can see, Emacs builds should 
no longer generate or use .deps subdirectories (as of March 17, roughly - when 
we switched away from Automake). If you have an old .deps subdirectory lying 
around from March-or-earlier builds, you should just remove it.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-.gitignore-Add-.deps.patch --]
[-- Type: text/x-patch; name="0001-.gitignore-Add-.deps.patch", Size: 485 bytes --]

From f1ed31a8f5c6f19aa5e119e670533241c6375945 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 28 Jul 2017 12:38:22 +0300
Subject: [PATCH] ; * .gitignore: Add .deps/.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 9229297..05a8d6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -112,6 +112,7 @@ lisp/subdirs.el
 
 # Dependencies.
 deps/
+.deps/
 
 # Logs and temporaries.
 *.log
-- 
2.7.4


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

* Re: .deps/ and .gitignore?
  2017-07-29  7:08 .deps/ and .gitignore? Paul Eggert
@ 2017-07-29  7:44 ` Eli Zaretskii
  2017-07-30 15:46   ` Paul Eggert
  2017-07-29  8:00 ` martin rudalics
  1 sibling, 1 reply; 6+ messages in thread
From: Eli Zaretskii @ 2017-07-29  7:44 UTC (permalink / raw)
  To: Paul Eggert; +Cc: Emacs-devel

> Cc: Emacs Development <Emacs-devel@gnu.org>
> From: Paul Eggert <eggert@cs.ucla.edu>
> Date: Sat, 29 Jul 2017 00:08:34 -0700
> 
> Was the attached patch actually needed?

"git status" suddenly started to show that directory as "??"
yesterday, so I presumed it was some new feature of Gnulib, not yet
reflected in .gitignore.

> As far as I can see, Emacs builds should no longer generate or use
> .deps subdirectories (as of March 17, roughly - when we switched
> away from Automake).

Yes, but I see now that you only removed .deps from .gitignore 2 days
ago, which would explain why I suddenly started seeing it.  May I
suggest that in the future you accompany that by posting here an
advice to make sure the directory is removed?

> If you have an old .deps subdirectory lying 
> around from March-or-earlier builds, you should just remove it.

OK, done, and the commit reverted.

Thanks.



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

* Re: .deps/ and .gitignore?
  2017-07-29  7:08 .deps/ and .gitignore? Paul Eggert
  2017-07-29  7:44 ` Eli Zaretskii
@ 2017-07-29  8:00 ` martin rudalics
  2017-07-29  9:13   ` Eli Zaretskii
  1 sibling, 1 reply; 6+ messages in thread
From: martin rudalics @ 2017-07-29  8:00 UTC (permalink / raw)
  To: Paul Eggert, Eli Zaretskii; +Cc: Emacs Development

 > If you have
 > an old .deps subdirectory lying around from March-or-earlier builds,
 > you should just remove it.

This is confusing.  Do I remove the .deps/ subdirectory or the src/lib/
one?  It's the latter here that gets marked as untracked.

martin



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

* Re: .deps/ and .gitignore?
  2017-07-29  8:00 ` martin rudalics
@ 2017-07-29  9:13   ` Eli Zaretskii
  2017-07-29 10:16     ` martin rudalics
  0 siblings, 1 reply; 6+ messages in thread
From: Eli Zaretskii @ 2017-07-29  9:13 UTC (permalink / raw)
  To: martin rudalics; +Cc: eggert, Emacs-devel

> Date: Sat, 29 Jul 2017 10:00:45 +0200
> From: martin rudalics <rudalics@gmx.at>
> CC: Emacs Development <Emacs-devel@gnu.org>
> 
>  > If you have
>  > an old .deps subdirectory lying around from March-or-earlier builds,
>  > you should just remove it.
> 
> This is confusing.  Do I remove the .deps/ subdirectory or the src/lib/
> one?

The lib/.deps/ one.

> It's the latter here that gets marked as untracked.

??? There's no src/lib/ directory here.



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

* Re: .deps/ and .gitignore?
  2017-07-29  9:13   ` Eli Zaretskii
@ 2017-07-29 10:16     ` martin rudalics
  0 siblings, 0 replies; 6+ messages in thread
From: martin rudalics @ 2017-07-29 10:16 UTC (permalink / raw)
  To: Eli Zaretskii; +Cc: eggert, Emacs-devel

These are in my build directories so git won't flag them separately.

 >> It's the latter here that gets marked as untracked.
 >
 > ??? There's no src/lib/ directory here.

Then mine is probably from a very old build I never cleaned up.  Funny
that it got now flagged for the first time as


Untracked files:
   (use "git add <file>..." to include in what will be committed)

	dbg/
	opt/
	src/lib/

nothing added to commit but untracked files present (use "git add" to track)


where dbg/ and opt/ are my build directories on Windows.

Thanks, martin



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

* Re: .deps/ and .gitignore?
  2017-07-29  7:44 ` Eli Zaretskii
@ 2017-07-30 15:46   ` Paul Eggert
  0 siblings, 0 replies; 6+ messages in thread
From: Paul Eggert @ 2017-07-30 15:46 UTC (permalink / raw)
  To: Eli Zaretskii; +Cc: Emacs-devel

Eli Zaretskii wrote:
> May I
> suggest that in the future you accompany that by posting here an
> advice to make sure the directory is removed?

Sure, that should be easy.



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

end of thread, other threads:[~2017-07-30 15:46 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-29  7:08 .deps/ and .gitignore? Paul Eggert
2017-07-29  7:44 ` Eli Zaretskii
2017-07-30 15:46   ` Paul Eggert
2017-07-29  8:00 ` martin rudalics
2017-07-29  9:13   ` Eli Zaretskii
2017-07-29 10:16     ` martin rudalics

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.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).