Re: [Gimp-docs] git commit problems

[Pat David <patdavid gmail com>]

Hi Kolbjørn!

From the looks of this, you are locally committing your changes, but aren't pushing them to the remote?

Not sure what the problem might be with the Ambiguous error.  It seems like perhaps git is confused between a local branch name and a remote tag?

I am not a git guru, so I will defer to one of those... :)

On Wed, Jan 13, 2016 at 2:48 PM Kolbjørn Stuestøl <kolbjoern stuestoel no> wrote:

As this question is related to the GIMP UI I posted this in developers
forum (gimp-developer-list gnome org) a couple of days ago but get no
answers. Hoping someone in this list are able to answer me. I guess it
has something with "git config" to do.

When committing my translation all looks well on my local copy. But my
translations do not shows up in the https://git.gnome.org/browse/gimp/
site. Where is my translations gone?

I downloaded my copies using "git clone <ssh://[my
username]@git.gnome.org/git/gimp>".
Updated and translated some po files and then:

    $ git commit -m "Updated Norwegian (nn) translations"
    [master 7b2f8a5] Updated Norwegian (nn) translations
      5 files changed, 13801 insertions(+), 9813 deletions(-)
      mode change 100644 => 100755 po-plug-ins/nn.po
      mode change 100644 => 100755 po-python/nn.po

My local git log shows:

    $ git log
    commit 7b2f8a5cff63bdea6db76b642445cfb8a11d1b0b
    Author: kolbjoern <kolbjoern git gnome org>
    Date:   Mon Jan 11 21:19:53 2016 +0100

         Updated Norwegian (nn) translations

    commit 97ea600623b780fc9dba4abbaa45db44e626a10e
    Author: Michael Natterer <mitch gimp org>
    Date:   Mon Jan 11 20:35:32 2016 +0100

         app: s/Default/Color/ in the testing icon theme Makefile rules
    …

My commit must obviously go somewhere but I have no idea where.
How to get it to upload (git push) to the correct gimp repository?

Last time I uploaded my files (2016.01.07) I got the error message
"remote: error: refname 'GIMP_HELP_2_8_2' is ambiguous" (but the "git
push" succeeded) and I was told to run "git config --global push.default
matching" and/or
"git config --global push.default simple". I did this in that order. No
error messages.

Kolbjørn
_______________________________________________
gimp-docs-list mailing list
gimp-docs-list gnome org
https://mail.gnome.org/mailman/listinfo/gimp-docs-list