Mailing List Archive: MythTV: Users

git & wiki

1 2

View All

Index | Next | Previous | View Threaded

udovdh at xs4all

Dec 7, 2010, 2:54 AM

Post #1 of 38 (2031 views)
Permalink

git & wiki

Hello,

Where on the wiki is the info as per what date and/or svn the developers
switched to git?

Where on the wiki is the info so we can check out from git and switch to
the right branch/tag/whatever to build 0.24-fixes?

Please let us know.

Thanks,
Udo
_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

jyavenard at gmail

Dec 7, 2010, 3:33 AM

Post #2 of 38 (2020 views)
Permalink

Re: git & wiki [In reply to]

On 7 December 2010 21:54, Udo van den Heuvel <udovdh [at] xs4all> wrote:
> Hello,
>
> Where on the wiki is the info as per what date and/or svn the developers
> switched to git?
>
> Where on the wiki is the info so we can check out from git and switch to
> the right branch/tag/whatever to build 0.24-fixes?
>
> Please let us know.

www.mythtv.org
_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

udovdh at xs4all

Dec 7, 2010, 4:10 AM

Post #3 of 38 (2016 views)
Permalink

Re: git & wiki [In reply to]

On 2010-12-07 12:33, Jean-Yves Avenard wrote:
>> Where on the wiki is the info as per what date and/or svn the developers
>> switched to git?
>>
>> Where on the wiki is the info so we can check out from git and switch to
>> the right branch/tag/whatever to build 0.24-fixes?
>>
>> Please let us know.
>
> www.mythtv.org

Did you read my question?
Did you understand it?
I asked for details.

But nevermind, I will contribute some non-info:

# git clone https://github.com/MythTV/mythtv.git mythtv.git
# cd mythtv.git
# git branch -r
origin/HEAD -> origin/master
origin/dkristjansson/mythtv-rec
origin/fixes/0.18
origin/fixes/0.19
origin/fixes/0.20
origin/fixes/0.21
origin/fixes/0.22
origin/fixes/0.23
origin/fixes/0.24
origin/master
origin/mythsystem-rewrite
origin/temp/newaudiosetup
# git checkout -b 0.24-fixes origin/fixes/0.24
# git branch
* 0.24-fixes
master
# git pull
Already up-to-date.
#

Is this the correct way to get the 0.24-fixes code and stay up-to-date?
Also: how can I easily find out the latest commit so that I can use this
info for the names for the rpms?

Kind regards,
Udo

_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

jyavenard at gmail

Dec 7, 2010, 4:28 AM

Post #4 of 38 (2005 views)
Permalink

Re: git & wiki [In reply to]

On 7 December 2010 23:10, Udo van den Heuvel <udovdh [at] xs4all> wrote:
> On 2010-12-07 12:33, Jean-Yves Avenard wrote:
>>> Where on the wiki is the info as per what date and/or svn the developers
>>> switched to git?
>>>
>>> Where on the wiki is the info so we can check out from git and switch to
>>> the right branch/tag/whatever to build 0.24-fixes?
>>>
>>> Please let us know.
>>
>> www.mythtv.org
>
> Did you read my question?
> Did you understand it?
> I asked for details.

sorry for trying to help..

won't happen again, promise..
_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

gravityhammer at gmail

Dec 7, 2010, 5:09 AM

Post #5 of 38 (2001 views)
Permalink

Re: git & wiki [In reply to]

On Tue, Dec 7, 2010 at 7:10 AM, Udo van den Heuvel <udovdh [at] xs4all> wrote:
> On 2010-12-07 12:33, Jean-Yves Avenard wrote:
>>> Where on the wiki is the info as per what date and/or svn the developers
>>> switched to git?
>>>
>>> Where on the wiki is the info so we can check out from git and switch to
>>> the right branch/tag/whatever to build 0.24-fixes?
>>>
>>> Please let us know.
>>
>> www.mythtv.org
>
> Did you read my question?
> Did you understand it?
> I asked for details.
>

Did you look at the first "Announcement" on the mythtv.org page?

Posted by xris on December 2nd 2010

MythTV is Moving to Github!
The MythTV developers decided to retire our subversion repository and
move our source control to github.
We will keep the existing subversion repository around for archival
purposes, but it will no longer receive updates.
We will continue to trac bugs in Trac (though we are considering other
options for the future).
This will only affect those of you who compile MythTV from source via
our subversion repository � the rest shouldn't notice anything from
this change.
Here are a few resources for those interested in continuing to follow
bleeding edge development, but are unfamiliar with git:
SVN to Git Crash Course
Github Help
The Git Community Book
Pro Git
To help organize things better for their maintainers, Themes, MythWeb,
and nuvexport have been split out of the main repository. We realize
that this may be an inconvenience for some people (especially
packagers), but after a rather lively discussion we decided that this
is the best option for future development and maintenance.
Additionally: Over the next few weeks we will slowly be migrating all
of our core services both to and back from a temporary host so that we
can rebuild our server environment from scratch. We appreciate your
understanding of any downtime that might occur from this migration,
and thank Schedules Direct for providing the temporary home.
_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

ctreleaven at cogeco

Dec 7, 2010, 5:13 AM

Post #6 of 38 (2004 views)
Permalink

Re: git & wiki [In reply to]

At 11:28 PM +1100 12/7/10, Jean-Yves Avenard wrote:
>On 7 December 2010 23:10, Udo van den Heuvel <udovdh [at] xs4all> wrote:
>> On 2010-12-07 12:33, Jean-Yves Avenard wrote:
>>>> Where on the wiki is the info as per what date and/or svn the developers
>>>> switched to git?
>>>>
>>>> Where on the wiki is the info so we can check out from git and switch to
>>>> the right branch/tag/whatever to build 0.24-fixes?
>>>>
>>>> Please let us know.
>>>
>>> www.mythtv.org
>>
>> Did you read my question?
>> Did you understand it?
>> I asked for details.
>
>sorry for trying to help..
>
>won't happen again, promise..

C'mon, you two, play nice! Udo, there have been lots of postings recently about GIT:
http://www.gossamer-threads.com/lists/engine?list=mythtv&do=search_results&search_forum=forum_1&search_string=git&search_type=AND&search_fields=sb&search_time=2w&search_user_username=&sb=score&mh=50

And the main front page for Myth has an announcement about GIT:
http://www.mythtv.org/

The questions you asked are specifically answered at the link J-Y provided.

Finally, I think it is clear to everyone but yourself that you have made such a pain in the ass of yourself here on this mailing list that you don't get any slack. IMHO.

In this case, you apparently aren't following the list, didn't search the archive, and didn't look at the Myth homepage. How can you be indignant when you won't help yourself?

Craig
_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

udovdh at xs4all

Dec 7, 2010, 5:20 AM

Post #7 of 38 (2003 views)
Permalink

Re: git & wiki [In reply to]

On 2010-12-07 14:09, Phil Bridges wrote:
> Did you look at the first "Announcement" on the mythtv.org page?

Yes.
No svn commit number.
No date.
No howto.
Just general documentation.

Of course we can dig into the manuals, but if you value that people
build their won stuff, a few lines of howto info would help us quite a
bit and save a few half hours.

Udo
_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

udovdh at xs4all

Dec 7, 2010, 5:24 AM

Post #8 of 38 (2002 views)
Permalink

Re: git & wiki [In reply to]

On 2010-12-07 14:13, Craig Treleaven wrote:
> C'mon, you two, play nice! Udo, there have been lots of postings recently about GIT:

I just checked the wiki, the main source of info.
I wrote about the wiki and git thing in the subject to make that clear.
A few lines, like the commands that I posted (if they are correct),
would have helped.

> http://www.mythtv.org/

Too general.

> The questions you asked are specifically answered at the link J-Y provided.

I don't think so.

> Finally, I think it is clear to everyone but yourself that you have made such a pain in the ass

You take stuff up too personal.
If you think that my remarks are a pain in the ass you do not get exact
meaning of terms like 'leak-free', 'userfriendly', 'complete info', etc.

I was just asking and I get answers to other questions.
You please read again, have a night of sleep and then say again what
part was bothering you so much and why.

Thanks for your time.

Udo

PS: tomorrow I will install the valgrind/profile build of svn 27420 and
try the valgrind runs.
_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

raven at themaw

Dec 8, 2010, 4:54 AM

Post #9 of 38 (1956 views)
Permalink

Re: git & wiki [In reply to]

On Tue, 2010-12-07 at 14:20 +0100, Udo van den Heuvel wrote:
> On 2010-12-07 14:09, Phil Bridges wrote:
> > Did you look at the first "Announcement" on the mythtv.org page?
>
> Yes.
> No svn commit number.
> No date.
> No howto.
> Just general documentation.
>
> Of course we can dig into the manuals, but if you value that people
> build their won stuff, a few lines of howto info would help us quite a
> bit and save a few half hours.

I disagree.

Unfortunately, along with the git good stuff comes some hurdles.
People need to read (or at least skim first time around) git oriented
documents and , here, probably st svn git related stuff. I've been using
git for a few years and I often still have to search for howto documents
and I'm still not up with the good stuff either.

Bookmark them, check'em out, it's worth it.

Ian

_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

udovdh at xs4all

Dec 8, 2010, 5:05 AM

Post #10 of 38 (1955 views)
Permalink

Re: git & wiki [In reply to]

On 2010-12-08 13:54, Ian Kent wrote:
> On Tue, 2010-12-07 at 14:20 +0100, Udo van den Heuvel wrote:
(...)
>> Of course we can dig into the manuals, but if you value that people
>> build their won stuff, a few lines of howto info would help us quite a
>> bit and save a few half hours.
>
> I disagree.
>
> Unfortunately, along with the git good stuff comes some hurdles.
> People need to read (or at least skim first time around) git oriented
> documents and , here, probably st svn git related stuff. I've been using
> git for a few years and I often still have to search for howto documents
> and I'm still not up with the good stuff either.
>
> Bookmark them, check'em out, it's worth it.

You contradict yourself.
Of course we need to learn the new tools.
But a quick howto can at least get us up and running.
The few git commands that I posted could be a base from which people can
start building their mythtv again.
The extra stuff they could figure out themselves.

E.g.: I still need to find out how to get the git commit number we're at
to adjust the name of the mythtv rpms.

Put this in a context where a not-SMART announcement is made: it is not
said when they will move, when they will be done moving, what svn is the
last svn commit or anything else. The text on the website is still not
adjusted to the supposed current situation. (are we done moving? what
was the last svn commit?)
We are just thrown into the git manuals and everybody expects stuff to
work well.

Udo
_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

dargllun at googlemail

Dec 8, 2010, 5:38 AM

Post #11 of 38 (1955 views)
Permalink

Re: git & wiki [In reply to]

On 08.12.2010 14:05, Udo van den Heuvel wrote:
> The few git commands that I posted could be a base from which people can
> start building their mythtv again.
> The extra stuff they could figure out themselves.

Why don't you just put it into www.mythtv.org? Once you have that you
could ask the devs to review it.

regards
greg

_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

raven at themaw

Dec 8, 2010, 5:57 AM

Post #12 of 38 (1956 views)
Permalink

Re: git & wiki [In reply to]

On Wed, 2010-12-08 at 14:05 +0100, Udo van den Heuvel wrote:
> On 2010-12-08 13:54, Ian Kent wrote:
> > On Tue, 2010-12-07 at 14:20 +0100, Udo van den Heuvel wrote:
> (...)
> >> Of course we can dig into the manuals, but if you value that people
> >> build their won stuff, a few lines of howto info would help us quite a
> >> bit and save a few half hours.
> >
> > I disagree.
> >
> > Unfortunately, along with the git good stuff comes some hurdles.
> > People need to read (or at least skim first time around) git oriented
> > documents and , here, probably st svn git related stuff. I've been using
> > git for a few years and I often still have to search for howto documents
> > and I'm still not up with the good stuff either.
> >
> > Bookmark them, check'em out, it's worth it.
>
> You contradict yourself.

No, I don't think so, maybe you just don't agree with me, which is fine.

> Of course we need to learn the new tools.
> But a quick howto can at least get us up and running.
> The few git commands that I posted could be a base from which people can
> start building their mythtv again.
> The extra stuff they could figure out themselves.
>
> E.g.: I still need to find out how to get the git commit number we're at
> to adjust the name of the mythtv rpms.

git show HEAD | head -1 | awk '{print $2}'

but that shows the full commit id. You probably only want to use the
first 8 digits of that. Other git tools get things right when the first
8 digits is provided and there hasn't been any time that I have tried to
use just the first 8 digits that has not returned the commit I was
after.

>
>
> Put this in a context where a not-SMART announcement is made: it is not
> said when they will move, when they will be done moving, what svn is the
> last svn commit or anything else. The text on the website is still not
> adjusted to the supposed current situation. (are we done moving? what
> was the last svn commit?)
> We are just thrown into the git manuals and everybody expects stuff to
> work well.
>
> Udo
> _______________________________________________
> mythtv-users mailing list
> mythtv-users [at] mythtv
> http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

raven at themaw

Dec 8, 2010, 6:07 AM

Post #13 of 38 (1954 views)
Permalink

Re: git & wiki [In reply to]

On Wed, 2010-12-08 at 21:57 +0800, Ian Kent wrote:
> >
> > E.g.: I still need to find out how to get the git commit number we're at
> > to adjust the name of the mythtv rpms.
>
> git show HEAD | head -1 | awk '{print $2}'
>
> but that shows the full commit id. You probably only want to use the
> first 8 digits of that. Other git tools get things right when the first
> 8 digits is provided and there hasn't been any time that I have tried to
> use just the first 8 digits that has not returned the commit I was
> after.

Of course that assumes you have a checkout of the branch you want to
work with. Oh .... suddenly, and very quickly, we need to talk about
remote tracking branches ...... and then things start to get painful,
read the doco.

Ian

_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

udovdh at xs4all

Dec 8, 2010, 7:10 AM

Post #14 of 38 (1948 views)
Permalink

Re: git & wiki [In reply to]

On 2010-12-08 15:07, Ian Kent wrote:
> On Wed, 2010-12-08 at 21:57 +0800, Ian Kent wrote:
>>> E.g.: I still need to find out how to get the git commit number we're at
>>> to adjust the name of the mythtv rpms.
>>
>> git show HEAD | head -1 | awk '{print $2}'

Hey, thanks!

>> but that shows the full commit id. You probably only want to use the
>> first 8 digits of that.

No problem. `cut` can fix that, maybe other tricks can help here, too.

>> Other git tools get things right when the first
>> 8 digits is provided and there hasn't been any time that I have tried to
>> use just the first 8 digits that has not returned the commit I was
>> after.

OK, that is helpful info!

> Of course that assumes you have a checkout of the branch you want to
> work with.

We do.

> Oh .... suddenly, and very quickly, we need to talk about
> remote tracking branches ...... and then things start to get painful,
> read the doco.

What do you mean here?
We do a `git pull` every now and then and we have a branch that is up to
date.

Kind regards,
Udo
_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

jarod at wilsonet

Dec 8, 2010, 8:13 AM

Post #15 of 38 (1944 views)
Permalink

Re: git & wiki [In reply to]

On Dec 8, 2010, at 10:10 AM, Udo van den Heuvel wrote:

> On 2010-12-08 15:07, Ian Kent wrote:
>> On Wed, 2010-12-08 at 21:57 +0800, Ian Kent wrote:
>>>> E.g.: I still need to find out how to get the git commit number we're at
>>>> to adjust the name of the mythtv rpms.
>>>
>>> git show HEAD | head -1 | awk '{print $2}'
>
> Hey, thanks!

No, ew, there are better ways. See below. :)

>>> but that shows the full commit id. You probably only want to use the
>>> first 8 digits of that.
>
> No problem. `cut` can fix that, maybe other tricks can help here, too.

git describe | cut -d- -f 3

>>> Other git tools get things right when the first
>>> 8 digits is provided and there hasn't been any time that I have tried to
>>> use just the first 8 digits that has not returned the commit I was
>>> after.
>
> OK, that is helpful info!

git describe gives you a minimal hash that is guaranteed to be unique.
If more than 8 characters are needed, it'll give 'em to you.

--
Jarod Wilson
jarod [at] wilsonet

_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

udovdh at xs4all

Dec 8, 2010, 8:32 AM

Post #16 of 38 (1928 views)
Permalink

Re: git & wiki [In reply to]

On 2010-12-08 17:13, Jarod Wilson wrote:
> On Dec 8, 2010, at 10:10 AM, Udo van den Heuvel wrote:
>> On 2010-12-08 15:07, Ian Kent wrote:
>>> On Wed, 2010-12-08 at 21:57 +0800, Ian Kent wrote:
>>>>> E.g.: I still need to find out how to get the git commit number we're at
>>>>> to adjust the name of the mythtv rpms.
>>>>
>>>> git show HEAD | head -1 | awk '{print $2}'
>>
>> Hey, thanks!
>
> No, ew, there are better ways. See below. :)
(...)
>
> git describe | cut -d- -f 3

Even better!
But it doesn't always work:

[root [at] recorde mythweb.git]# pwd
/usr/src/mythweb.git
[root [at] recorde mythweb.git]# git describe | cut -d- -f 3
fatal: No names found, cannot describe anything.
[root [at] recorde mythweb.git]# git show HEAD | head -1 | awk '{print $2}'
52cb8fb98f1aa209cfd2befa92a9cdd0b7841070

How come?

> git describe gives you a minimal hash that is guaranteed to be unique.
> If more than 8 characters are needed, it'll give 'em to you.

Aha. Hmm. The info is getting complete enough to change around the
svn-rsync-rpm-build to git-rsync-rpm-build...

Thanks,
Udo
_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

nick.rout at gmail

Dec 8, 2010, 11:10 AM

Post #17 of 38 (1921 views)
Permalink

Re: git & wiki [In reply to]

On Thu, Dec 9, 2010 at 5:32 AM, Udo van den Heuvel <udovdh [at] xs4all> wrote:
> On 2010-12-08 17:13, Jarod Wilson wrote:
>> On Dec 8, 2010, at 10:10 AM, Udo van den Heuvel wrote:
>>> On 2010-12-08 15:07, Ian Kent wrote:
>>>> On Wed, 2010-12-08 at 21:57 +0800, Ian Kent wrote:
>>>>>> E.g.: I still need to find out how to get the git commit number we're at
>>>>>> to adjust the name of the mythtv rpms.
>>>>>
>>>>> git show HEAD | head -1 | awk '{print $2}'
>>>
>>> Hey, thanks!
>>
>> No, ew, there are better ways. See below. :)
> (...)
>>
>> git describe | cut -d- -f 3
>
> Even better!
> But it doesn't always work:
>
> [root [at] recorde mythweb.git]# pwd
> /usr/src/mythweb.git
> [root [at] recorde mythweb.git]# git describe | cut -d- -f 3
> fatal: No names found, cannot describe anything.
> [root [at] recorde mythweb.git]# git show HEAD | head -1 | awk '{print $2}'
> 52cb8fb98f1aa209cfd2befa92a9cdd0b7841070
>
> How come?
>
>> git describe gives you a minimal hash that is guaranteed to be unique.
>> If more than 8 characters are needed, it'll give 'em to you.
>
> Aha. Hmm. The info is getting complete enough to change around the
> svn-rsync-rpm-build to git-rsync-rpm-build...

Yes and I think most of that was in the original thread, which is on
the usual list archives.
_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

jarod at wilsonet

Dec 8, 2010, 11:20 AM

Post #18 of 38 (1914 views)
Permalink

Re: git & wiki [In reply to]

On Dec 8, 2010, at 11:32 AM, Udo van den Heuvel wrote:

> On 2010-12-08 17:13, Jarod Wilson wrote:
>> On Dec 8, 2010, at 10:10 AM, Udo van den Heuvel wrote:
>>> On 2010-12-08 15:07, Ian Kent wrote:
>>>> On Wed, 2010-12-08 at 21:57 +0800, Ian Kent wrote:
>>>>>> E.g.: I still need to find out how to get the git commit number we're at
>>>>>> to adjust the name of the mythtv rpms.
>>>>>
>>>>> git show HEAD | head -1 | awk '{print $2}'
>>>
>>> Hey, thanks!
>>
>> No, ew, there are better ways. See below. :)
> (...)
>>
>> git describe | cut -d- -f 3
>
> Even better!
> But it doesn't always work:
>
> [root [at] recorde mythweb.git]# pwd
> /usr/src/mythweb.git
> [root [at] recorde mythweb.git]# git describe | cut -d- -f 3
> fatal: No names found, cannot describe anything.
> [root [at] recorde mythweb.git]# git show HEAD | head -1 | awk '{print $2}'
> 52cb8fb98f1aa209cfd2befa92a9cdd0b7841070
>
> How come?

Not sure how you managed that, I've never had it not work. Are
you running that in a local branch and/or with a detached HEAD?

--
Jarod Wilson
jarod [at] wilsonet

_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

mtdean at thirdcontact

Dec 8, 2010, 11:37 AM

Post #19 of 38 (1918 views)
Permalink

Re: git & wiki [In reply to]

On 12/08/2010 02:20 PM, Jarod Wilson wrote:
> On Dec 8, 2010, at 11:32 AM, Udo van den Heuvel wrote:
>> Even better!
>> But it doesn't always work:
>>
>> [root [at] recorde mythweb.git]# pwd
>> /usr/src/mythweb.git
>> [root [at] recorde mythweb.git]# git describe | cut -d- -f 3
>> fatal: No names found, cannot describe anything.
>> [root [at] recorde mythweb.git]# git show HEAD | head -1 | awk '{print $2}'
>> 52cb8fb98f1aa209cfd2befa92a9cdd0b7841070
>>
>> How come?
> Not sure how you managed that, I've never had it not work. Are
> you running that in a local branch and/or with a detached HEAD?

That happens in all the repos which have no tags/names on the master
branch (i.e. everything except mythtv).

git describe --always

will give you the SHA1 abbreviation.

However, I'd recommend using --dirty, too, so you can see if it's a
modified copy:

git describe --always --dirty

Mike
_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

justin.johnson3 at gmail

Dec 8, 2010, 12:12 PM

Post #20 of 38 (1923 views)
Permalink

Re: git & wiki [In reply to]

On Wed, Dec 8, 2010 at 2:37 PM, Michael T. Dean <mtdean [at] thirdcontact> wrote:
> �On 12/08/2010 02:20 PM, Jarod Wilson wrote:
>>
>> On Dec 8, 2010, at 11:32 AM, Udo van den Heuvel wrote:
>>>
>>> Even better!
>>> But it doesn't always work:
>>>
>>> [root [at] recorde mythweb.git]# pwd
>>> /usr/src/mythweb.git
>>> [root [at] recorde mythweb.git]# git describe | cut -d- -f 3
>>> fatal: No names found, cannot describe anything.
>>> [root [at] recorde mythweb.git]# git show HEAD | head -1 | awk '{print $2}'
>>> 52cb8fb98f1aa209cfd2befa92a9cdd0b7841070
>>>
>>> How come?
>>
>> Not sure how you managed that, I've never had it not work. Are
>> you running that in a local branch and/or with a detached HEAD?
>
> That happens in all the repos which have no tags/names on the master branch
> (i.e. everything except mythtv).
>
> git describe --always
>
> will give you the SHA1 abbreviation.
>
> However, I'd recommend using --dirty, too, so you can see if it's a modified
> copy:
>
> git describe --always --dirty
>
> Mike

As a suggestion, git allows for aliases to be defined in your .gitconfig file

[alias]
desc = describe --always --dirty

then use:
git desc

Also, for cloning and checking out a specific branch you can use:
git clone git://github.com/MythTV/mythtv.git -b fixes/0.24
to check out the 0.24-fixes branch in one go.

Then,
git pull
to get updates.

Really, just read the git man pages. They're insanely helpful and I've
never seen a set of man pages that are so complete.
--Justin
_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

raven at themaw

Dec 8, 2010, 5:58 PM

Post #21 of 38 (1887 views)
Permalink

Re: git & wiki [In reply to]

On Wed, 2010-12-08 at 16:10 +0100, Udo van den Heuvel wrote:
> > Oh .... suddenly, and very quickly, we need to talk about
> > remote tracking branches ...... and then things start to get painful,
> > read the doco.
>
> What do you mean here?
> We do a `git pull` every now and then and we have a branch that is up to
> date.

Well, yeah, but time and experience will tell.
I've found that I can easily get myself into trouble, at times, for the
strangest things, ;)

Ian

_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

raven at themaw

Dec 8, 2010, 6:03 PM

Post #22 of 38 (1884 views)
Permalink

Re: git & wiki [In reply to]

On Wed, 2010-12-08 at 11:13 -0500, Jarod Wilson wrote:
> On Dec 8, 2010, at 10:10 AM, Udo van den Heuvel wrote:
>
> > On 2010-12-08 15:07, Ian Kent wrote:
> >> On Wed, 2010-12-08 at 21:57 +0800, Ian Kent wrote:
> >>>> E.g.: I still need to find out how to get the git commit number we're at
> >>>> to adjust the name of the mythtv rpms.
> >>>
> >>> git show HEAD | head -1 | awk '{print $2}'
> >
> > Hey, thanks!
>
> No, ew, there are better ways. See below. :)
>
>
> >>> but that shows the full commit id. You probably only want to use the
> >>> first 8 digits of that.
> >
> > No problem. `cut` can fix that, maybe other tricks can help here, too.
>
> git describe | cut -d- -f 3

Ha, cool, never used that before!

>
> >>> Other git tools get things right when the first
> >>> 8 digits is provided and there hasn't been any time that I have tried to
> >>> use just the first 8 digits that has not returned the commit I was
> >>> after.
> >
> > OK, that is helpful info!
>
> git describe gives you a minimal hash that is guaranteed to be unique.
> If more than 8 characters are needed, it'll give 'em to you.

But won't a variable length commit number cause havoc with things like
rpm version comparisons. I guess there's a need to ensure that the
version string components used allow for a previous component that is
always increasing.

Ian

_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

nick.rout at gmail

Dec 8, 2010, 7:11 PM

Post #23 of 38 (1876 views)
Permalink

Re: git & wiki [In reply to]

On Thu, Dec 9, 2010 at 3:03 PM, Ian Kent <raven [at] themaw> wrote:
> On Wed, 2010-12-08 at 11:13 -0500, Jarod Wilson wrote:
>> On Dec 8, 2010, at 10:10 AM, Udo van den Heuvel wrote:
>>
>> > On 2010-12-08 15:07, Ian Kent wrote:
>> >> On Wed, 2010-12-08 at 21:57 +0800, Ian Kent wrote:
>> >>>> E.g.: I still need to find out how to get the git commit number we're at
>> >>>> to adjust the name of the mythtv rpms.
>> >>>
>> >>> git show HEAD | head -1 | awk '{print $2}'
>> >
>> > Hey, thanks!
>>
>> No, ew, there are better ways. See below. :)
>>
>>
>> >>> but that shows the full commit id. You probably only want to use the
>> >>> first 8 digits of that.
>> >
>> > No problem. �`cut` can fix that, maybe other tricks can help here, too.
>>
>> git describe | cut -d- -f 3
>
> Ha, cool, never used that before!
>
>>
>> >>> Other git tools get things right when the first
>> >>> 8 digits is provided and there hasn't been any time that I have tried to
>> >>> use just the first 8 digits that has not returned the commit I was
>> >>> after.
>> >
>> > OK, that is helpful info!
>>
>> git describe gives you a minimal hash that is guaranteed to be unique.
>> If more than 8 characters are needed, it'll give 'em to you.
>
> But won't a variable length commit number cause havoc with things like
> rpm version comparisons. I guess there's a need to ensure that the
> version string components used allow for a previous component that is
> always increasing.

mythbuntu is now numbering by date yyyymmdd then a hash number, eg:

mythtv-common-0.24.0+fixes.20101208.3e9463e-0ubuntu0mythbuntu1
_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

jarod at wilsonet

Dec 8, 2010, 7:17 PM

Post #24 of 38 (1876 views)
Permalink

Re: git & wiki [In reply to]

On Dec 8, 2010, at 9:03 PM, Ian Kent wrote:

> On Wed, 2010-12-08 at 11:13 -0500, Jarod Wilson wrote:
>> On Dec 8, 2010, at 10:10 AM, Udo van den Heuvel wrote:
>>
...
>>
>>>>> Other git tools get things right when the first
>>>>> 8 digits is provided and there hasn't been any time that I have tried to
>>>>> use just the first 8 digits that has not returned the commit I was
>>>>> after.
>>>
>>> OK, that is helpful info!
>>
>> git describe gives you a minimal hash that is guaranteed to be unique.
>> If more than 8 characters are needed, it'll give 'em to you.
>
> But won't a variable length commit number cause havoc with things like
> rpm version comparisons.

Not if done correctly, per Fedora's packaging guidelines.

> I guess there's a need to ensure that the
> version string components used allow for a previous component that is
> always increasing.

See:

https://fedoraproject.org/wiki/Packaging:NamingGuidelines#Release_Tag

--
Jarod Wilson
jarod [at] wilsonet

_______________________________________________
mythtv-users mailing list
mythtv-users [at] mythtv
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-users

mythtv-users at westbrook

Dec 8, 2010, 7:32 PM

Post #25 of 38 (1878 views)
Permalink

Re: git & wiki [In reply to]

On Wed, Dec 8, 2010 at 20:11, Nick Rout <nick.rout [at] gmail> wrote:

> > But won't a variable length commit number cause havoc with things like
> > rpm version comparisons. I guess there's a need to ensure that the
> > version string components used allow for a previous component that is
> > always increasing.
>
> mythbuntu is now numbering by date yyyymmdd then a hash number, eg:
>
> mythtv-common-0.24.0+fixes.20101208.3e9463e-0ubuntu0mythbuntu1
>

Just as another way: To keep it numeric, increasing, and consistent, I'm
currently numbering my Gentoo ebuilds using the unix integer commit
timestamp of the commit at the point in question, which I can capture when
checked out to the right HEAD using:

$ echo 0.24.$(git log -n1 --pretty="format:%ct")
0.24.1291777173

In reverse, I obtain the commit hash from that point in time on that branch
with:

$ echo $(git log -n1 --pretty="format:%H" --since=1291777173
--until=1291777173)
hash = ee57332927393d071d7b3f1788476f07c77f7e82

which is great for direct checkout or use with github's tarball URL feature.

Git is fun, isn't it!

$0.02,
EW

1 2

View All

Index | Next | Previous | View Threaded

Interested in having your list archived? Contact Gossamer Threads