Re: problem with git

On Fri, May 8, 2009 at 8:40 AM, Simos Xenitellis <simos lists googlemail com> wrote:

Did you create the clones using the anonymous clones from my website?
Can you verify?

sir, it was downloaded from http://git.gnome.org/cgit/ through terminal commands.

To check that your clone has been properly converted, try

git pull --rebase

i have done that as you can see from the output in terminal.

You ran 'intltool-update -P' which created po/brasero.pot.
This file does not get committed, so the above command shows there is
nothing to commit.
If you did not commit something earlier, then there is nothing that
can be pushed.

yes, i had run it to get the latest and updated the translation

> drtv narayana:~/git/brasero$ git push
> To ssh://vasudeven git gnome org/git/brasero
> ! [rejected] master -> master (non-fast forward)
> error: failed to push some refs to
> 'ssh://vasudeven git gnome org/git/brasero'

It is strange that you get an error, since there is probably nothing to push.

> drtv narayana:~/git/brasero$ git pull --rebase
> remote: Counting objects: 31, done.
> remote: Compressing objects: 100% (23/23), done.
> remote: Total 23 (delta 21), reused 0 (delta 0)
> Unpacking objects: 100% (23/23), done.
> From ssh://vasudeven git gnome org/git/brasero
> 17fe531..54f7ba8 master -> origin/master
> First, rewinding head to replay your work on top of it...
> Applying Updated Tamil translation
> Applying Updated Tamil translation

This shows that there are two commits that were pushed earlier and are
not downloaded.
It appears you committed those changes at some point earlier.

the mistake i did was first to commit with out replacing the ta.po file.
second to commit and not push.
i did not realise that was also needed.
when the changes did not appear in the web i went back to the howto page and found the mistake.
so i tried to push with the results you see.

> drtv narayana:~/git/brasero$ git status
> # On branch master
> # Untracked files:
> # (use "git add <file>..." to include in what will be committed)
> #
> # po/brasero.pot
> nothing added to commit but untracked files present (use "git add" to track)
> drtv narayana:~/git/brasero$ git add ta.po
> fatal: pathspec 'ta.po' did not match any files

The ta.po should be in po/, so

git add po/ta.po

'git status' however does not show that po/ta.po is a new untracked file.

Simos