After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 731309 - Fix git ignores
Fix git ignores
Status: RESOLVED FIXED
Product: hitori
Classification: Applications
Component: General
0.4.x
Other All
: Normal normal
: ---
Assigned To: hitori-maint
hitori-maint
Depends on:
Blocks:
 
 
Reported: 2014-06-06 03:40 UTC by Michael Catanzaro
Modified: 2014-06-23 18:34 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Add src/.gitignore (751 bytes, patch)
2014-06-06 03:40 UTC, Michael Catanzaro
needs-work Details | Review
git.mk: ignore .deps and all .o files (1.78 KB, patch)
2014-06-23 18:34 UTC, Michael Catanzaro
committed Details | Review

Description Michael Catanzaro 2014-06-06 03:40:52 UTC
Turns out git.mk doesn't really work with nonrecursive Automake, and
we're left with several unignored files.
Comment 1 Michael Catanzaro 2014-06-06 03:40:53 UTC
Created attachment 277982 [details] [review]
Add src/.gitignore
Comment 2 Philip Withnall 2014-06-11 08:24:57 UTC
Review of attachment 277982 [details] [review]:

I would much prefer this to be fixed in git.mk if it isn't already. Please try updating git.mk from https://github.com/behdad/git.mk; if that doesn't fix the problem, git.mk needs fixing to be less specific about its .deps and *.o matches.
Comment 3 Michael Catanzaro 2014-06-18 00:35:17 UTC
Fair enough.

Looks like this is [1]

[1] https://github.com/behdad/git.mk/issues/15
Comment 4 Michael Catanzaro 2014-06-23 17:37:17 UTC
I submitted a patch to git.mk upstream last week but it hasn't gotten any attention yet.  Since I think git.mk purity is Not Very Important, would you be OK with applying it in Hitori early?
Comment 5 Philip Withnall 2014-06-23 17:55:39 UTC
(In reply to comment #4)
> I submitted a patch to git.mk upstream last week but it hasn't gotten any
> attention yet.  Since I think git.mk purity is Not Very Important, would you be
> OK with applying it in Hitori early?

By all means! Please include a link to the Github issue in your commit message. We can then refresh git.mk from upstream whenever it’s fixed.

Behdad will get round to reviewing it at some point soon, I’m sure. He’s normally pretty quick with these things.
Comment 6 Michael Catanzaro 2014-06-23 18:34:29 UTC
The following fix has been pushed:
c23e112 git.mk: ignore .deps and all .o files
Comment 7 Michael Catanzaro 2014-06-23 18:34:31 UTC
Created attachment 279059 [details] [review]
git.mk: ignore .deps and all .o files

Fixes

 Untracked files:
       src/.deps/
       src/src_hitori-generator.o
       src/src_hitori-interface.o
       src/src_hitori-main.o
       src/src_hitori-rules.o

Proposed for upstream at https://github.com/behdad/git.mk/issues/15