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

might help. -- yashi

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://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)

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 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.gall@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.