If I've cloned the repo via:
# git clone -n --depth 1 https://github.com/Logitech/slimserver.git /usr/share/lms/server
..and then attempt to check out the last squeezecenter version via
# cd /usr/share/lms/server
# git checkout "7.3"
..why am I getting a slimserver.pl file with:
our $VERSION = '7.4';
Results 1 to 5 of 5
Thread: github branch checkout question
2012-07-12, 21:02 #1
github branch checkout question
2012-07-12, 21:06 #2
If I subsequently check out:
# git checkout '7.4'
..I end up with a slimserver.pl file with:
our $VERSION = '7.4.3';
When I've checked out version 7.3, shouldn't I have the 7.3.4 version of squeezecenter? Wasn't that the last released version before the 7.4 branch?
Is there a problem with https://github.com/Logitech/slimserver.git?
2012-07-13, 00:24 #3
github branch checkout question
> # git checkout "7.3"
> ..why am I getting a slimserver.pl file with:
> our $VERSION = '7.4';
Hmm... don't know what happened there, but mine shows 7.3.4, as expected.
2012-07-13, 11:13 #4
SOURCEREPO='https://github.com/Logitech/slimserver.git' mkdir lms.git cd lms.git git clone -n "$SOURCEREPO" ./server Cloning into './server'... remote: Counting objects: 159907, done. remote: Compressing objects: 100% (32737/32737), done. remote: Total 159907 (delta 115623), reused 159893 (delta 115609) Receiving objects: 100% (159907/159907), 577.47 MiB | 178 KiB/s, done. Resolving deltas: 100% (115623/115623), done. cd server/.git du -sh . 583M cd .. git checkout '7.3' Note: checking out '7.3'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b new_branch_name HEAD is now at a4b0b05... r47277@macbookpro-eth (orig r24277): mherger | 2008-12-11 05:17:15 -0500 Bug: n/a Description: add missing WELCOME_TO_CONTROLLER string r47278@macbookpro-eth (orig r24278): mherger | 2008-12-11 05:29:59 -0500 Bug: n/a Description: revert accidental change r47280@macbookpro-eth (orig r24280): titmuss | 2008-12-11 09:36:16 -0500 Bug: N/A Description: Fixes to ramp_test so it runs in MV. r47281@macbookpro-eth (orig r24281): titmuss | 2008-12-11 10:55:47 -0500 Bug: N/A Description: Ramp test updates with improved reporting. cat slimserver.pl | egrep 'our.*VERSION.*=' our $VERSION = '7.4';
2012-07-13, 11:38 #5
OK, I think I'm just putting my lack of understanding of how to use git on parade here. If I do:
# git checkout 'origin/master'
# git checkout 'origin/7.3'
# cat slimserver.pl | egrep 'our.*VERSION.*='
..this now yields the expected:
our $VERSION = '7.3.4';
With this, I'm only seeing minimal/trivial differences between the .git 7.3 branch and a fresh svn check out of http://svn.slimdevices.com/repos/slim/7.3/trunk/server
diff -w -B --recursive '--exclude=\.*' ./lms.git/server/ ./squeezecenter.svn/server/ :
Only in ./squeezecenter.svn/server/CPAN: CGI Only in ./squeezecenter.svn/server/CPAN: MPEG