Re: git oddness
On 15 December 2011 13:06, Tom Gall tom.g...@linaro.org wrote: Hi All, I'm trying to push some code to my repo on git.linaro.org and it's like the repo is silently failing Note the following: I know Canonical IS are doing some rearrangements of Linaro git hosting today to make it faster and more reliable. I have no idea if that is related to this problem or not. -- Martin ___ linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
git oddness
Hi All, I'm trying to push some code to my repo on git.linaro.org and it's like the repo is silently failing Note the following: tgall@mars:~/libjpeg-turbo-android/libjpeg-turbo$ git push ssh://tomg...@git.linaro.org/~/public_git/libjpeg-turbo/libjpeg-turbo.git android:origin/1.2-beta-linaro-andoid Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 429 bytes, done. Total 3 (delta 2), reused 0 (delta 0) To ssh://tomg...@git.linaro.org/~/public_git/libjpeg-turbo/libjpeg-turbo.git 746c51b..95ed21e android - origin/1.2-beta-linaro-andoid tgall@mars:~/libjpeg-turbo-android/libjpeg-turbo$ git status # On branch android # Your branch is ahead of 'origin/1.2-beta-linaro-andoid' by 1 commit. # nothing to commit (working directory clean) tgall@mars:~/libjpeg-turbo-android/libjpeg-turbo$ git push ssh://tomg...@git.linaro.org/~/public_git/libjpeg-turbo/libjpeg-turbo.git android:origin/1.2-beta-linaro-andoid Everything up-to-date tgall@mars:~/libjpeg-turbo-android/libjpeg-turbo$ git branch * android master tgall@mars:~/libjpeg-turbo-android/libjpeg-turbo$ git branch -r origin/1.1.0-linaro origin/1.1.1-linaro origin/1.1.1-linaro-android origin/1.2-beta-linaro-andoid origin/HEAD - origin/master origin/master git log does correctly show the commit on the local branch: commit 95ed21e84965f859da0792558742f9cbf9d4ac7a Author: Tom Gall tom.g...@linaro.org Date: Wed Dec 14 19:20:49 2011 -0600 Remove config.h since it was conflicting with other Android components. From cyang. ideas? suggestions? -- Regards, Tom Where's the kaboom!? There was supposed to be an earth-shattering kaboom! Marvin Martian Multimedia Tech Lead | Linaro.org │ Open source software for ARM SoCs w) tom.gall att linaro.org w) tom_gall att vnet.ibm.com h) tom_gall att mac.com ___ linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
Re: git oddness
On Wed, Dec 14, 2011 at 8:55 PM, Yasushi SHOJI ya...@atmark-techno.com wrote: Hi, At Wed, 14 Dec 2011 20:06:14 -0600, Tom Gall wrote: I'm trying to push some code to my repo on git.linaro.org and it's like the repo is silently failing Note the following: tgall@mars:~/libjpeg-turbo-android/libjpeg-turbo$ git push ssh://tomg...@git.linaro.org/~/public_git/libjpeg-turbo/libjpeg-turbo.git android:origin/1.2-beta-linaro-andoid Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 429 bytes, done. Total 3 (delta 2), reused 0 (delta 0) To ssh://tomg...@git.linaro.org/~/public_git/libjpeg-turbo/libjpeg-turbo.git 746c51b..95ed21e android - origin/1.2-beta-linaro-andoid tgall@mars:~/libjpeg-turbo-android/libjpeg-turbo$ git status # On branch android # Your branch is ahead of 'origin/1.2-beta-linaro-andoid' by 1 commit. # nothing to commit (working directory clean) [...] ideas? suggestions? if your origin and the repo you are pushing to is different, git tells you that your local is ahead of the origin, because the origin is not updated yet. $ git remote show origin Hi Yashi, Thanks for the response. Hmm this looks right. The git web interface isn't showing the new commit nor does the new commit appear when a fresh clone etc is obtained. tgall@mars:~/libjpeg-turbo-android/libjpeg-turbo$ git remote show origin * remote origin Fetch URL: git://git.linaro.org/people/tomgall/libjpeg-turbo/libjpeg-turbo.git Push URL: git://git.linaro.org/people/tomgall/libjpeg-turbo/libjpeg-turbo.git HEAD branch: master Remote branches: 1.1.0-linaro tracked 1.1.1-linaro tracked 1.1.1-linaro-android tracked 1.2-beta-linaro-andoid tracked master tracked Local branches configured for 'git pull': android merges with remote 1.2-beta-linaro-andoid master merges with remote master Local ref configured for 'git push': master pushes to master (up to date) might help. -- yashi -- Regards, Tom Where's the kaboom!? There was supposed to be an earth-shattering kaboom! Marvin Martian Multimedia Tech Lead | Linaro.org │ Open source software for ARM SoCs w) tom.gall att linaro.org w) tom_gall att vnet.ibm.com h) tom_gall att mac.com ___ linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
Re: git oddness
On 12/15/2011 11:08 AM, Somebody in the thread at some point said: On Wed, Dec 14, 2011 at 8:55 PM, Yasushi SHOJIya...@atmark-techno.com wrote: Hi, At Wed, 14 Dec 2011 20:06:14 -0600, Tom Gall wrote: I'm trying to push some code to my repo on git.linaro.org and it's like the repo is silently failing Note the following: To ssh://tomg...@git.linaro.org/~/public_git/libjpeg-turbo/libjpeg-turbo.git Push URL: git://git.linaro.org/people/tomgall/libjpeg-turbo/libjpeg-turbo.git Is it because these two paths are not the same? You're pushing to one place on the remote filesystem but pulling / gitwebbing from another? -Andy -- Andy Green | TI Landing Team Leader Linaro.org │ Open source software for ARM SoCs | Follow Linaro http://facebook.com/pages/Linaro/155974581091106 - http://twitter.com/#!/linaroorg - http://linaro.org/linaro-blog ___ linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
Re: git oddness
On 12/14/2011 08:06 PM, Tom Gall wrote: Hi All, I'm trying to push some code to my repo on git.linaro.org and it's like the repo is silently failing Note the following: tgall@mars:~/libjpeg-turbo-android/libjpeg-turbo$ git push ssh://tomg...@git.linaro.org/~/public_git/libjpeg-turbo/libjpeg-turbo.git android:origin/1.2-beta-linaro-andoid Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 429 bytes, done. Total 3 (delta 2), reused 0 (delta 0) To ssh://tomg...@git.linaro.org/~/public_git/libjpeg-turbo/libjpeg-turbo.git 746c51b..95ed21e android - origin/1.2-beta-linaro-andoid tgall@mars:~/libjpeg-turbo-android/libjpeg-turbo$ git status # On branch android # Your branch is ahead of 'origin/1.2-beta-linaro-andoid' by 1 commit. # nothing to commit (working directory clean) tgall@mars:~/libjpeg-turbo-android/libjpeg-turbo$ git push ssh://tomg...@git.linaro.org/~/public_git/libjpeg-turbo/libjpeg-turbo.git android:origin/1.2-beta-linaro-andoid Everything up-to-date tgall@mars:~/libjpeg-turbo-android/libjpeg-turbo$ git branch * android master tgall@mars:~/libjpeg-turbo-android/libjpeg-turbo$ git branch -r origin/1.1.0-linaro origin/1.1.1-linaro origin/1.1.1-linaro-android origin/1.2-beta-linaro-andoid origin/HEAD - origin/master origin/master git log does correctly show the commit on the local branch: commit 95ed21e84965f859da0792558742f9cbf9d4ac7a Author: Tom Gall tom.g...@linaro.org Date: Wed Dec 14 19:20:49 2011 -0600 Remove config.h since it was conflicting with other Android components. From cyang. ideas? suggestions? If you didn't create the local branch with the --tracking you might need to be explicit with your push like: $ git push origin/1.2-beta-linaro-andoid HEAD I think you could use android instead of HEAD but they'd be equivalent since you are on that branch. ___ linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
