[katello-devel] PATCH: katello-configure.spec for the puppet installation

Mike McCune mmccune at redhat.com
Thu Sep 15 22:55:36 UTC 2011


On 09/15/2011 01:27 PM, Jan Pazdziora wrote:
> On Thu, Sep 15, 2011 at 08:31:12AM -0700, Mike McCune wrote:
>>>
>>> Did you perhaps forget to git push the --tags?
>>
>> hmm, I pushed them yesterday:
>>
>> http://git.fedorahosted.org/git/?p=katello.git;a=commit;h=d626d7880fac446c5dd8dc74f23e34d391ed7638
>>
>> http://git.fedorahosted.org/git/?p=katello.git;a=commit;h=92921f4ca8caa40efa8d8627c8938f04dc1f1c65
>
> Fire a
>
> 	gitk --all
>
> to visualize what happened. The tag
>
> 	katello-configure-0.1.1-1
> 	http://git.fedorahosted.org/git/?p=katello.git;a=tag;h=8cce5c93b3d5be20267c196af67cfa0ffef5bb97
>
> points to commit
>
> 	http://git.fedorahosted.org/git/?p=katello.git;a=commit;h=d626d7880fac446c5dd8dc74f23e34d391ed7638
>
> -- that's right. But that's *not* the commit which is in master, that
> one is
>
> 	http://git.fedorahosted.org/git/?p=katello.git;a=commit;h=428237224f2d17a743420cf9f1c7b1ab8143f1a6
>
> If I had to venture a guess, you did git push --tags *before* you
> did git push, then your git push failed, you rebased, but the tags
> were already out, pointing to out-of-master-dead-end-no-branch chain
> of commits.
>
> Tito's recommendation is
>
> 	git push&&  git push --tags
>
> to avoid this kind of problems.
>

yeah, 99% of the time I chain the 2 commands after a 'tito tag' but for 
some reason I spaced and didn't do this last night.  Apologies for the 
confusion.

-- 
Mike McCune
mmccune AT redhat.com
Red Hat Engineering       | Portland, OR
Systems Management        | 650.254.4248




More information about the katello-devel mailing list