On Wed, Dec 14, 2011 at 8:55 PM, Yasushi SHOJI yashi@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://tomgall@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://tomgall@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