[PATCH] Rewrote various GConf checks to standardize on xmlfilecontent tests and ensured they were actually checking the correct location (gconf.xml.mandatory, not gconf.xml.defaults). (UNCLASSIFIED)

Maura Dailey maura at eclipse.ncsc.mil
Mon Jan 6 16:18:37 UTC 2014


I do a git pull. Does that include git fetch?

My git-fu is weak. I skipped subversion and went straight to git from 
CVS, so I make bad assumptions about how git works every once in a while.

- Maura Dailey

On 01/05/2014 01:23 PM, Jeff Bachtel wrote:
> Are you running git fetch before commit/status? If not, then 
> commit/status have no way of knowing where HEAD currently is for origin.
>
> Apologies if your git-fu is far beyond that, that particular issue bit 
> me before,
>
> Jeff
>
>
> On 12/27/2013 03:56 PM, Shawn Wells wrote:
>> On 12/27/13, 3:42 PM, Maura Dailey wrote:
>>> ...Sometimes I really hate git. The patches all show up as applied 
>>> in my git log, no pending anything. I'm recloning and will try 
>>> recommitting again in just a few minutes. 
>>
>> I had the same thing just yesterday when Ray posted the RPM build was 
>> broke ;)
>>
>> 'git commit' showed no outstanding patches against origin, but sure 
>> enough there were a few.... I'd certainly be interested in hearing 
>> what I'm doing wrong if anyone knows!
>> _______________________________________________
>> scap-security-guide mailing list
>> scap-security-guide at lists.fedorahosted.org
>> https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
>
> _______________________________________________
> scap-security-guide mailing list
> scap-security-guide at lists.fedorahosted.org
> https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide



More information about the scap-security-guide mailing list