[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pywikipediabot-users
Subject:    Re: [Pywikipedia-l] Ignore Changes not staged for commit
From:       Mpaa <mpaa.wiki () gmail ! com>
Date:       2014-01-31 14:40:10
Message-ID: CAPuciEPP25oRL0+sDw2o9OK8+WChZfZR8snocsGoSSDkP1ff=Q () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


it seems so


On Fri, Jan 31, 2014 at 3:12 PM, Merlijn van Deen <valhallasw@arctus.nl>wrote:

> Does ignore=all work?
> 
> 
> On 31 January 2014 13:32, Mpaa <mpaa.wiki@gmail.com> wrote:
> 
> > This is mine:
> > 1 [submodule "i18n"]
> > 2     path = scripts/i18n
> > 3     url = https://gerrit.wikimedia.org/r/p/pywikibot/i18n.git
> > 4     branch = .
> > 5     ignore = dirty
> > 6
> > 7 [submodule "externals/httplib2"]
> > 8     path = ex/httplib2ternals/httplib2
> > 9     url =
> > https://gerrit.wikimedia.org/r/p/pywikibot/externals/httplib2.git
> > 10     branch = .
> > 11     ignore = dirty
> > 
> > Looks like ignore = dirty is already there ...
> > 
> > 
> > On Fri, Jan 31, 2014 at 1:24 PM, Merlijn van Deen <valhallasw@arctus.nl>wrote:
> > 
> > > 
> > > https://stackoverflow.com/questions/3240881/git-can-i-suppress-listing-of-modified-content-dirty-submodule-entries-in-sta
> > >  
> > > So the trick is to adapt .gitmodules, not .gitignore.
> > > 
> > > Merlijn
> > > 
> > > 
> > > On 31 January 2014 09:56, Mpaa <mpaa.wiki@gmail.com> wrote:
> > > 
> > > > Hi.
> > > > 
> > > > Is there a way to avoid having these to file to always show up as
> > > > non-staged?
> > > > 
> > > > $ git status
> > > > # On branch cat
> > > > # Changes not staged for commit:
> > > > #   (use "git add <file>..." to update what will be committed)
> > > > #   (use "git checkout -- <file>..." to discard changes in working
> > > > directory)
> > > > #
> > > > #       modified:   externals/httplib2 (new commits)
> > > > #       modified:   scripts/i18n (new commits)
> > > > 
> > > > I found this suggestion online (can't remember where):
> > > > Some files in a repository, which are versioned (i.e. they can't be
> > > > git-ignored), are often changed,
> > > > but rarely committed. Usually these are various local configuration
> > > > files that are edited,
> > > > but should never be committed upstream.
> > > > 
> > > > Git lets you ignore those files by assuming they are unchanged. This is
> > > > done by running the
> > > > git update-index --assume-unchanged path/to/file.txt
> > > > 
> > > > but it is not a permanent solution.
> > > > 
> > > > Bye
> > > > Mpaa
> > > > 
> > > > _______________________________________________
> > > > Pywikipedia-l mailing list
> > > > Pywikipedia-l@lists.wikimedia.org
> > > > https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l
> > > > 
> > > > 
> > > 
> > > _______________________________________________
> > > Pywikipedia-l mailing list
> > > Pywikipedia-l@lists.wikimedia.org
> > > https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l
> > > 
> > > 
> > 
> > _______________________________________________
> > Pywikipedia-l mailing list
> > Pywikipedia-l@lists.wikimedia.org
> > https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l
> > 
> > 
> 
> _______________________________________________
> Pywikipedia-l mailing list
> Pywikipedia-l@lists.wikimedia.org
> https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l
> 
> 


[Attachment #5 (text/html)]

<div dir="ltr">it seems so<br></div><div class="gmail_extra"><br><br><div \
class="gmail_quote">On Fri, Jan 31, 2014 at 3:12 PM, Merlijn van Deen <span \
dir="ltr">&lt;<a href="mailto:valhallasw@arctus.nl" \
target="_blank">valhallasw@arctus.nl</a>&gt;</span> wrote:<br> <blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"><div dir="ltr">Does ignore=all work?</div><div \
class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><br><div \
class="gmail_quote"> On 31 January 2014 13:32, Mpaa <span dir="ltr">&lt;<a \
href="mailto:mpaa.wiki@gmail.com" target="_blank">mpaa.wiki@gmail.com</a>&gt;</span> \
wrote:<br>

<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"><div dir="ltr"><div>This is mine:<br>  1 [submodule \
&quot;i18n&quot;]<br>  2     path = scripts/i18n<br>  3     url = <a \
href="https://gerrit.wikimedia.org/r/p/pywikibot/i18n.git" \
target="_blank">https://gerrit.wikimedia.org/r/p/pywikibot/i18n.git</a><br>



  4     branch = .<br>  5     ignore = dirty<br>  6<br>  7 [submodule \
&quot;externals/httplib2&quot;]<br>  8     path = ex/httplib2ternals/httplib2<br>  9  \
url = <a href="https://gerrit.wikimedia.org/r/p/pywikibot/externals/httplib2.git" \
target="_blank">https://gerrit.wikimedia.org/r/p/pywikibot/externals/httplib2.git</a><br>




 10     branch = .<br> 11     ignore = dirty<br><br></div>Looks like ignore = dirty \
is already there ...<br></div><div><div><div class="gmail_extra"><br><br><div \
class="gmail_quote">On Fri, Jan 31, 2014 at 1:24 PM, Merlijn van Deen <span \
dir="ltr">&lt;<a href="mailto:valhallasw@arctus.nl" \
target="_blank">valhallasw@arctus.nl</a>&gt;</span> wrote:<br>



<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"><div dir="ltr"><a \
href="https://stackoverflow.com/questions/3240881/git-can-i-suppress-listing-of-modified-content-dirty-submodule-entries-in-sta" \
target="_blank">https://stackoverflow.com/questions/3240881/git-can-i-suppress-listing-of-modified-content-dirty-submodule-entries-in-sta</a><div>






<br></div><div>So the trick is to adapt .gitmodules, not .gitignore.</div><span><font \
color="#888888"><div><br></div><div>Merlijn</div></font></span></div><div \
class="gmail_extra"><br><br><div class="gmail_quote"> <div><div>On 31 January 2014 \
09:56, Mpaa <span dir="ltr">&lt;<a href="mailto:mpaa.wiki@gmail.com" \
target="_blank">mpaa.wiki@gmail.com</a>&gt;</span> wrote:<br>

</div></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px \
#ccc solid;padding-left:1ex"><div><div><div \
dir="ltr"><div><div><div><div>Hi.<br><br>Is there a way to avoid having these to file \
to always show up as non-staged?<br>





<br>$ git status<br># On branch cat<br># Changes not staged for commit:<br>#   (use \
&quot;git add &lt;file&gt;...&quot; to update what will be committed)<br> #   (use \
&quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working \
directory)<br> #<br>#       modified:   externals/httplib2 (new commits)<br>#       \
modified:   scripts/i18n (new commits)<br><br></div>I found this suggestion online \
(can&#39;t remember where):<br><div style="margin-left:40px">Some files in a \
repository, which are versioned (i.e. they can&#39;t be git-ignored), are often \
changed,<br>






but rarely committed. Usually these are various local configuration files that are \
edited,<br>but should never be committed upstream.<br><br>Git lets you ignore those \
files by assuming they are unchanged. This is done by running the<br>






    git update-index --assume-unchanged path/to/file.txt<br></div><br></div>but it is \
not a permanent solution.<br></div><div><br></div>Bye<span><font \
color="#888888"><br></font></span></div><span><font color="#888888">Mpaa<br>





</font></span></div>
<br></div></div><div>_______________________________________________<br>
Pywikipedia-l mailing list<br>
<a href="mailto:Pywikipedia-l@lists.wikimedia.org" \
target="_blank">Pywikipedia-l@lists.wikimedia.org</a><br> <a \
href="https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l" \
target="_blank">https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l</a><br> \
<br></div></blockquote></div><br></div> \
<br>_______________________________________________<br> Pywikipedia-l mailing \
list<br> <a href="mailto:Pywikipedia-l@lists.wikimedia.org" \
target="_blank">Pywikipedia-l@lists.wikimedia.org</a><br> <a \
href="https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l" \
target="_blank">https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l</a><br> \
<br></blockquote></div><br></div> \
</div></div><br>_______________________________________________<br> Pywikipedia-l \
mailing list<br> <a href="mailto:Pywikipedia-l@lists.wikimedia.org" \
target="_blank">Pywikipedia-l@lists.wikimedia.org</a><br> <a \
href="https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l" \
target="_blank">https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l</a><br> \
<br></blockquote></div><br></div> \
</div></div><br>_______________________________________________<br> Pywikipedia-l \
mailing list<br> <a href="mailto:Pywikipedia-l@lists.wikimedia.org">Pywikipedia-l@lists.wikimedia.org</a><br>
 <a href="https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l" \
target="_blank">https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l</a><br> \
<br></blockquote></div><br></div>


[Attachment #6 (text/plain)]

_______________________________________________
Pywikipedia-l mailing list
Pywikipedia-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic