push/pull problems
This discussion is connected to the gimp-docs-list.gnome.org mailing list which is provided by the GIMP developers and not related to gimpusers.com.
This is a read-only list on gimpusers.com so this discussion thread is read-only, too.
push/pull problems | Kolbjørn Stuestøl | 19 Mar 12:03 |
push/pull problems | Roman Joost | 24 Mar 02:24 |
4BA7A7F1.7060701@stuestoel.no | 07 Oct 20:29 | |
push/pull problems | Kolbjørn Stuestøl | 23 Mar 13:19 |
push/pull problems | Claude Paroz | 23 Mar 21:52 |
push/pull problems | Kolbjørn Stuestøl | 23 Mar 22:44 |
push/pull problems | Claude Paroz | 23 Mar 23:41 |
push/pull problems | Kolbjørn Stuestøl | 24 Mar 12:30 |
push/pull problems | Kolbjørn Stuestøl | 24 Mar 18:23 |
push/pull problems | Roman Joost | 26 Mar 10:16 |
push/pull problems | Kolbjørn Stuestøl | 26 Mar 15:56 |
4BA7585C.7090407@stuestoel.no | 07 Oct 20:29 | |
598e9211003220459r45697819x... | 07 Oct 20:29 | |
4BA762CB.5080109@stuestoel.no | 07 Oct 20:29 | |
598e9211003220626m2ced0479j... | 07 Oct 20:29 |
push/pull problems
When trying to pull or push files from/to server I get the following message:
$ git push
ssh: connect to host stuestoel.no port 22: Connection timed out
fatal: The remote end hung up unexpectedly
According to what said in live.gnome.org/TranslationProject/GitHowTo my account is accepted. I.e. the command ssh -v MYUSERNAME@git.gnome.org returns what expected.
I do not know what "host stuestoel.no" is. (Assuming GNOME has nothing to do on my home site www.stuestoel.no). I think I have given a wrong command somewhere, but what do I have to do to correct it?
My config file is
$ git config -l
user.name=Kolbjørn Stuestøl
user.email=kolbjoern@src.gnome.org
color.ui=auto
remote.origin.url=ssh://kolbjoern@stuestoel.no/git/gimp-help-2
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
core.ignorecase=true
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.url=ssh://kolbjoern@git.gnome.org/git/gimp-help-2
branch.master.remote=origin
branch.master.merge=refs/heads/master
BTW: Why is the remote.origin.url defined twice? Kolbjoern
push/pull problems
Invalid .doap fil?
Finally I get through, resulting in another problem ;-) "git push" results in this return message:
$ git push
Counting objects: 848, done.
Compressing objects: 100% (435/435), done.
Writing objects: 100% (486/486), 219.00 KiB | 13 KiB/s, done.
Total 486 (delta 255), reused 4 (delta 0)
---
ERROR: gimp-help-2.doap is not valid:
Invalid foaf:mbox property should be a mailto: URL
Please see:
http://live.gnome.org/MaintainersCorner#maintainers
---
To ssh://kolbjoern@git.gnome.org/git/gimp-help-2
! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to
'ssh://kolbjoern@git.gnome.org/git/gimp-help-2'
I have not changed the .doap file. Compared the gimp-help-2.doap to the
one on the web site mentioned and found of course no difference in the
setup. I do not believe the error is in the .doap file as others
obviously are using it without problem and I have not changed it.
The steps before the "git push":
*** Validating XML (nn) ... nn: no errors.
$ git add .
$ git commit -m "Updated Norwegian translation" [master 075746b] Updated Norwegian translation 1 files changed, 1 insertions(+), 8 deletions(-)
Checked the http://git.gnome.org/browse/gimp-help-2/ in case of newer
updates. None.
Some help?
Kolbjoern
push/pull problems
Le mardi 23 mars 2010 à 13:19 +0100, Kolbjørn Stuestøl a écrit :
Invalid .doap fil?
Finally I get through, resulting in another problem ;-) "git push" results in this return message:
$ git push Counting objects: 848, done. Compressing objects: 100% (435/435), done. Writing objects: 100% (486/486), 219.00 KiB | 13 KiB/s, done. Total 486 (delta 255), reused 4 (delta 0) ---
ERROR: gimp-help-2.doap is not valid: Invalid foaf:mbox property should be a mailto: URLPlease see: http://live.gnome.org/MaintainersCorner#maintainers ---
To ssh://kolbjoern@git.gnome.org/git/gimp-help-2 ! [remote rejected] master -> master (pre-receive hook declined) error: failed to push some refs to 'ssh://kolbjoern@git.gnome.org/git/gimp-help-2'I have not changed the .doap file. Compared the gimp-help-2.doap to the one on the web site mentioned and found of course no difference in the setup. I do not believe the error is in the .doap file as others obviously are using it without problem and I have not changed it.
The steps before the "git push":*** Validating XML (nn) ... nn: no errors.
$ git add .
Never, never do that. You might have untracked files (generated by some operation) or files automatically changed for any reason (e.g. you host files on a FAT32 partition). 'git status' will tell you about that. Then 'git add' selected files that you purposely changed.
HTH,
Claude
push/pull problems
Claude Paroz skreiv:
Le mardi 23 mars 2010 à 13:19 +0100, Kolbjørn Stuestøl a écrit :
Invalid .doap fil?
Finally I get through, resulting in another problem ;-) "git push" results in this return message:
$ git push Counting objects: 848, done. Compressing objects: 100% (435/435), done. Writing objects: 100% (486/486), 219.00 KiB | 13 KiB/s, done. Total 486 (delta 255), reused 4 (delta 0) ---
ERROR: gimp-help-2.doap is not valid: Invalid foaf:mbox property should be a mailto: URLPlease see: http://live.gnome.org/MaintainersCorner#maintainers ---
To ssh://kolbjoern@git.gnome.org/git/gimp-help-2 ! [remote rejected] master -> master (pre-receive hook declined) error: failed to push some refs to 'ssh://kolbjoern@git.gnome.org/git/gimp-help-2'I have not changed the .doap file. Compared the gimp-help-2.doap to the one on the web site mentioned and found of course no difference in the setup. I do not believe the error is in the .doap file as others obviously are using it without problem and I have not changed it.
The steps before the "git push":*** Validating XML (nn) ... nn: no errors.
$ git add .
Never, never do that.
Never do what? Change the .doap file or whatever?
You might have untracked files (generated by some operation) or files automatically changed for any reason (e.g. you host files on a FAT32 partition). 'git status' will tell you about that. Then 'git add' selected files that you purposely changed.
HTH,
Claude
I have run the "git status" but omitted it in the listing above because I do not understand what it tells me. I obviously have to study the git sites a bit more. The last thing I did before "git push" was as listed. ("git add ." --- "git status" --- "git commit"). Kolbjoern
push/pull problems
Le mardi 23 mars 2010 à 22:44 +0100, Kolbjørn Stuestøl a écrit :
Claude Paroz skreiv:
Le mardi 23 mars 2010 à 13:19 +0100, Kolbjørn Stuestøl a écrit :
Invalid .doap fil?
Finally I get through, resulting in another problem ;-) "git push" results in this return message:
$ git push Counting objects: 848, done. Compressing objects: 100% (435/435), done. Writing objects: 100% (486/486), 219.00 KiB | 13 KiB/s, done. Total 486 (delta 255), reused 4 (delta 0) ---
ERROR: gimp-help-2.doap is not valid: Invalid foaf:mbox property should be a mailto: URLPlease see: http://live.gnome.org/MaintainersCorner#maintainers ---
To ssh://kolbjoern@git.gnome.org/git/gimp-help-2 ! [remote rejected] master -> master (pre-receive hook declined) error: failed to push some refs to 'ssh://kolbjoern@git.gnome.org/git/gimp-help-2'I have not changed the .doap file. Compared the gimp-help-2.doap to the one on the web site mentioned and found of course no difference in the setup. I do not believe the error is in the .doap file as others obviously are using it without problem and I have not changed it.
The steps before the "git push":*** Validating XML (nn) ... nn: no errors.
$ git add .
Never, never do that.
Never do what? Change the .doap file or whatever?
Never do "git add .". Basically, this command tell gits that all modified/new files in the checkout should be added in the next commit. In most of cases, this will add too much unwanted stuff (like the .doap file you never intended to modify).
It is better to add selectively the files you know you want to be committed. (e.g. git add po/sv/gimp.po)
Claude
push/pull problems
Hi Kolbjørn,
On Fri, Mar 19, 2010 at 12:03:00PM +0100, Kolbjørn Stuestøl wrote:
When trying to pull or push files from/to server I get the following message:
My config file is$ git config -l user.name=Kolbjørn Stuestøl
user.email=kolbjoern@src.gnome.org color.ui=auto
remote.origin.url=ssh://kolbjoern@stuestoel.no/git/gimp-help-2
remove that ^
[...]
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* remote.origin.url=ssh://kolbjoern@git.gnome.org/git/gimp-help-2 branch.master.remote=origin
branch.master.merge=refs/heads/masterBTW: Why is the remote.origin.url defined twice? Kolbjoern
You may have set one globally by accident?
Cheers,
push/pull problems
Claude Paroz skreiv:
Never do "git add .". Basically, this command tell gits that all modified/new files in the checkout should be added in the next commit. In most of cases, this will add too much unwanted stuff (like the .doap file you never intended to modify).
It is better to add selectively the files you know you want to be committed. (e.g. git add po/sv/gimp.po)
Claude
Thank you Claude and Roman
I'll work further on these tips. Hoping to succeed some day.
Kolbjoern
push/pull problems
At last I got through.
Thank you Claude, Roman, and Julien.(private mails) and to Ulf for
changing the gimp-help-2.doap file.
As I am the only Norwegian translator, I have time to correct any
mistakes or mash ups :-)
I do not know what went wrong at the first place and how I corrected it. I just removed all new git files from my folders and started from scratch again.
Kolbjoern
push/pull problems
On Wed, Mar 24, 2010 at 06:23:09PM +0100, Kolbjørn Stuestøl wrote:
At last I got through.
Thank you Claude, Roman, and Julien.(private mails) and to Ulf for changing the gimp-help-2.doap file.
As I am the only Norwegian translator, I have time to correct any mistakes or mash ups :-)I do not know what went wrong at the first place and how I corrected it. I just removed all new git files from my folders and started from scratch again.
While you're saying that, I'll sometimes use:
git clean -x -d -f
to remove all files which were generated during the setup or install process to start from scratch. Keep in mind before executing that this will also wipe all unknown files to git from the directory, including your working version you haven't committed ;)
Cheers,
push/pull problems
Roman Joost skreiv:
While you're saying that, I'll sometimes use:
git clean -x -d -f
to remove all files which were generated during the setup or install process to start from scratch. Keep in mind before executing that this will also wipe all unknown files to git from the directory, including your working version you haven't committed ;)
Cheers,
Oh, should have known this command before :-) Much better and faster than my handwork. I save the tip for future use. It will come ;-). Another reason for reading the git handbook more carefully. Kolbjoern