how to use git as subversion

>>>> And You have to use additional set of commands to synchronize with
>>>> remote repositories.
>>>
>>> Bahhhhh... Which one ? (:=)))
>>>
>> "git push"?
>
> But i do "git push". Do you read my previous mail ?

I did but I did not notice traces of git push. Perhaps I was just blind.

Gert
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

Ok,

I find the problem: it's mail email adress badly formatted :

[gilles@localhost core]$ git ci -v

[2.0 88584e6] update
 1 files changed, 0 insertions(+), 2 deletions(-)
[gilles@localhost core]$ git push
Counting objects: 5, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 285 bytes, done.
Total 3 (delta 2), reused 0 (delta 0)
remote: This commit is available for viewing at:
remote: http://commits.kde.org/digikam/88584e6b56381c536d28482d1ac98a733bbbd49a
To ssh://[hidden email]/digikam
   8bd57bc..88584e6  2.0 -> development/2.0
[gilles@localhost core]$

Gilles

2011/2/7 Gilles Caulier <[hidden email]>:

> ok, some progress...
>
> Damned... git it's a big puzzle. welcome to future errors...
>
> I set this, as Marcel said in a previous mail :
>
> [gilles@localhost core]$ git config --global push.default tracking
>
> and now, when i touch NEWS file, to commit to remote repository, i can
> see error messages.
>
> File is committed locally :
>
> [gilles@localhost core]$ git ci -v
>
> [2.0 596dd0e] update
>  1 files changed, 0 insertions(+), 2 deletions(-)
>
> ... It's fine. Now i PUSH the file to remote server :
>
> [gilles@localhost core]$ git push -v
> Pushing to ssh://[hidden email]/digikam
> Counting objects: 5, done.
> Delta compression using up to 2 threads.
> Compressing objects: 100% (3/3), done.
> Writing objects: 100% (3/3), 288 bytes, done.
> Total 3 (delta 2), reused 0 (delta 0)
> remote: Audit failure - Commit
> 596dd0e1430516916227e970488d03a97f90b7e3 - Email Address - caulier dot
> gilles at gmail dot com
> remote: Traceback (most recent call last):
> remote:   File "hooks/update.secondary", line 79, in <module>
> remote:     auditor.audit_metadata()
> remote:   File "/home/git/repo-management/hooks/hooklib.py", line 353,
> in audit_metadata
> remote:     domain = extraction.group(2)
> remote: AttributeError: 'NoneType' object has no attribute 'group'
> remote: error: hook declined to update refs/heads/development/2.0
> To ssh://[hidden email]/digikam
>  ! [remote rejected] 2.0 -> development/2.0 (hook declined)
> error: failed to push some refs to 'ssh://[hidden email]/digikam'
>
> What is that (:=))))
>
> Gilles (thinking that Git is an unproductive tool !)
>
>
>
>
>
>
>
>
> 2011/2/7 Gilles Caulier <[hidden email]>:
>> 2011/2/7 Gert Kello <[hidden email]>:
>>>>> And You have to use additional set of commands to synchronize with
>>>>> remote repositories.
>>>>
>>>> Bahhhhh... Which one ? (:=)))
>>>>
>>> "git push"?
>>
>> But i do "git push". Do you read my previous mail ?
>>
>> Gilles
>>
>

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

Just to be clear, this is my git config :

[gilles@localhost ~]$ cat .gitconfig
[url "git://anongit.kde.org/"]
        insteadOf = kde:

[url "[hidden email]:"]
        pushInsteadOf = kde:

[url "ssh://[hidden email]/"]
        pushinsteadof = kde://

[alias]
        up = pull --rebase -v
        ci = commit -a -v
[core]
        editor = mcedit
[user]
        name = Gilles Caulier
        email = [hidden email]
[push]
        default = tracking

Gilles Caulier

2011/2/7 Gilles Caulier <[hidden email]>:

> ok, some progress...
>
> Damned... git it's a big puzzle. welcome to future errors...
>
> I set this, as Marcel said in a previous mail :
>
> [gilles@localhost core]$ git config --global push.default tracking
>
> and now, when i touch NEWS file, to commit to remote repository, i can
> see error messages.
>
> File is committed locally :
>
> [gilles@localhost core]$ git ci -v
>
> [2.0 596dd0e] update
>  1 files changed, 0 insertions(+), 2 deletions(-)
>
> ... It's fine. Now i PUSH the file to remote server :
>
> [gilles@localhost core]$ git push -v
> Pushing to ssh://[hidden email]/digikam
> Counting objects: 5, done.
> Delta compression using up to 2 threads.
> Compressing objects: 100% (3/3), done.
> Writing objects: 100% (3/3), 288 bytes, done.
> Total 3 (delta 2), reused 0 (delta 0)
> remote: Audit failure - Commit
> 596dd0e1430516916227e970488d03a97f90b7e3 - Email Address - caulier dot
> gilles at gmail dot com
> remote: Traceback (most recent call last):
> remote:   File "hooks/update.secondary", line 79, in <module>
> remote:     auditor.audit_metadata()
> remote:   File "/home/git/repo-management/hooks/hooklib.py", line 353,
> in audit_metadata
> remote:     domain = extraction.group(2)
> remote: AttributeError: 'NoneType' object has no attribute 'group'
> remote: error: hook declined to update refs/heads/development/2.0
> To ssh://[hidden email]/digikam
>  ! [remote rejected] 2.0 -> development/2.0 (hook declined)
> error: failed to push some refs to 'ssh://[hidden email]/digikam'
>
> What is that (:=))))
>
> Gilles (thinking that Git is an unproductive tool !)
>
>
>
>
>
>
>
>
> 2011/2/7 Gilles Caulier <[hidden email]>:
>> 2011/2/7 Gert Kello <[hidden email]>:
>>>>> And You have to use additional set of commands to synchronize with
>>>>> remote repositories.
>>>>
>>>> Bahhhhh... Which one ? (:=)))
>>>>
>>> "git push"?
>>
>> But i do "git push". Do you read my previous mail ?
>>
>> Gilles
>>
>

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

2011/2/6 Marcel Wiesweg <[hidden email]>:

>
> Short summary:
>
> git up
>
> git commit <path>
> git push
>
> where "git up" is an alias for "git pull --rebase", as given in the longer
> mail.

I still have a problem with this :

[gilles@localhost core]$ pwd
/mnt/data/Devel/GIT/digikam-sc/core

[gilles@localhost core]$ ls -al
total 4514
drwxr-xr-x 16 gilles gilles    1296 2011-02-07 12:17 ./
drwxr-xr-x  8 gilles gilles     608 2011-02-07 11:37 ../
-rw-r--r--  1 gilles gilles    8730 2011-02-07 11:20 AUTHORS
-rw-r--r--  1 gilles gilles 4257925 2011-02-07 11:19 ChangeLog
drwxr-xr-x  4 gilles gilles     104 2011-02-07 11:19 cmake/
drwxr-xr-x  4 gilles gilles     200 2011-02-07 11:37 CMakeFiles/
-rw-r--r--  1 gilles gilles    2204 2011-02-07 11:37 cmake_install.cmake
-rw-r--r--  1 gilles gilles   77498 2011-02-07 11:20 CMakeLists.txt
-rw-r--r--  1 gilles gilles    1942 2011-02-07 11:37 config-digikam.h
-rw-r--r--  1 gilles gilles    1978 2011-02-07 11:20 config-digikam.h.cmake
-rw-r--r--  1 gilles gilles   18011 2011-02-07 11:19 COPYING
-rw-r--r--  1 gilles gilles   20403 2011-02-07 11:19 COPYING.DOC
-rw-r--r--  1 gilles gilles   26527 2011-02-07 11:19 COPYING.LIB
-rw-r--r--  1 gilles gilles     429 2011-02-07 11:37 CTestTestfile.cmake
drwxr-xr-x  9 gilles gilles     360 2011-02-07 11:37 data/
drwxr-xr-x  3 gilles gilles     488 2011-02-07 11:37 databaseserver/
-rw-r--r--  1 gilles gilles     911 2011-02-07 11:19 DESIGN
drwxr-xr-x  4 gilles gilles   12984 2011-02-07 12:23 digikam/
-rw-r--r--  1 gilles gilles    1159 2011-02-07 11:37 digikam.lsm
-rw-r--r--  1 gilles gilles    1186 2011-02-07 11:19 digikam.lsm.cmake
-rw-r--r--  1 gilles gilles   64333 2011-02-07 11:19 Doxyfile.cmake
drwxr-xr-x  8 gilles gilles     392 2011-02-07 12:23 .git/
-rw-r--r--  1 gilles gilles   15827 2011-02-07 11:19 HACKING
drwxr-xr-x  8 gilles gilles     368 2011-02-07 11:37 imageplugins/
-rw-r--r--  1 gilles gilles      87 2011-02-07 11:19 INSTALL
drwxr-xr-x  3 gilles gilles    1056 2011-02-07 11:37 kioslave/
-rw-r--r--  1 gilles gilles      80 2011-02-07 11:19 .krazy
drwxr-xr-x 18 gilles gilles     632 2011-02-07 11:37 libs/
-rw-r--r--  1 gilles gilles     101 2011-02-07 11:19 Mainpage.dox
-rw-r--r--  1 gilles gilles    6764 2011-02-07 11:37 Makefile
-rwxr-xr-x  1 gilles gilles     231 2011-02-07 11:19 Messages.sh*
-rw-r--r--  1 gilles gilles    3785 2011-02-07 12:17 NEWS
drwxr-xr-x  7 gilles gilles     864 2011-02-07 11:19 project/
-rw-r--r--  1 gilles gilles    7254 2011-02-07 11:20 README
-rw-r--r--  1 gilles gilles    1402 2011-02-07 11:20 README.FACE
drwxr-xr-x  4 gilles gilles     440 2011-02-07 11:37 showfoto/
-rw-r--r--  1 gilles gilles     585 2011-02-07 11:37 svnscript.cmake
drwxr-xr-x  5 gilles gilles    1400 2011-02-07 11:20 tests/
drwxr-xr-x  2 gilles gilles     392 2011-02-07 11:20 themedesigner/
-rw-r--r--  1 gilles gilles    6381 2011-02-07 11:19 tips
-rw-r--r--  1 gilles gilles    3226 2011-02-07 11:19 TODO
-rw-r--r--  1 gilles gilles     279 2011-02-07 11:20 TODO.FACE
-rw-r--r--  1 gilles gilles    2607 2011-02-07 11:19 TODO.MYSQLPORT
-rw-r--r--  1 gilles gilles    3096 2011-02-07 11:20 TODO.QTSCRIPT
drwxr-xr-x 22 gilles gilles     768 2011-02-07 11:37 utilities/

[gilles@localhost core]$ git pull --rebase -v
fatal: The remote end hung up unexpectedly

why ?

Gilles
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

> [gilles@localhost core]$ git pull --rebase -v
> fatal: The remote end hung up unexpectedly
>

a) It might be temporary problem at remote end.
b) Can You give the output of "git branch -a"?

Gert
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

2011/2/7 Gert Kello <[hidden email]>:
>> [gilles@localhost core]$ git pull --rebase -v
>> fatal: The remote end hung up unexpectedly
>>
>
> a) It might be temporary problem at remote end.
> b) Can You give the output of "git branch -a"?
>


[gilles@localhost core]$ date
Mon Feb  7 13:01:27 CET 2011
[gilles@localhost core]$ git pull --rebase -v
fatal: The remote end hung up unexpectedly
[gilles@localhost core]$ git branch -a
* 2.0
  master
  remotes/origin/HEAD -> origin/master
  remotes/origin/development/0.10
  remotes/origin/development/0.8
  remotes/origin/development/0.8.x
  remotes/origin/development/0.9.x
  remotes/origin/development/1.2
  remotes/origin/development/1.3
  remotes/origin/development/2.0
  remotes/origin/kde3
  remotes/origin/master
[gilles@localhost core]$

Gilles
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

You could also verify if output of "git remote -v show" is what is
expected, but otherwise I have no idea.

Or, if You want to test without url rewrite, then You could write
following into the core/.git/config

[remote "origin"]
[..]
        url = git://anongit.kde.org/digikam.git
        pushurl = ssh://[hidden email]/digikam.git

Gert

On 7 February 2011 14:08, Gilles Caulier <[hidden email]> wrote:
> 2011/2/7 Gert Kello <[hidden email]>:
>>> [gilles@localhost core]$ git pull --rebase -v
>>> fatal: The remote end hung up unexpectedly
>>>
>>
>> a) It might be temporary problem at remote end.
>> b) Can You give the output of "git branch -a"?
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

I suspect something wrong in KDE server. I tried to update my local
git amarok repository :

[gilles@localhost amarok]$ pwd
/mnt/data/Devel/GIT/amarok

[gilles@localhost amarok]$ git pull
git.kde.org[0: 195.135.221.71]: errno=Connection timed out
fatal: unable to connect a socket (Connection timed out)

Somebody can confirm ?

Gilles

2011/2/7 Gert Kello <[hidden email]>:

> You could also verify if output of "git remote -v show" is what is
> expected, but otherwise I have no idea.
>
> Or, if You want to test without url rewrite, then You could write
> following into the core/.git/config
>
> [remote "origin"]
> [..]
>        url = git://anongit.kde.org/digikam.git
>        pushurl = ssh://[hidden email]/digikam.git
>
> Gert
>
> On 7 February 2011 14:08, Gilles Caulier <[hidden email]> wrote:
>> 2011/2/7 Gert Kello <[hidden email]>:
>>>> [gilles@localhost core]$ git pull --rebase -v
>>>> fatal: The remote end hung up unexpectedly
>>>>
>>>
>>> a) It might be temporary problem at remote end.
>>> b) Can You give the output of "git branch -a"?
> _______________________________________________
> Digikam-devel mailing list
> [hidden email]
> https://mail.kde.org/mailman/listinfo/digikam-devel
>

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

too strange :

[gilles@localhost digikam-sc]$ git remote -v show
origin  git://anongit.kde.org/scratch/mwiesweg/digikam-sc (fetch)
origin  [hidden email]:scratch/mwiesweg/digikam-sc (push)

Really git is obscure for me.

Gilles

2011/2/7 Gert Kello <[hidden email]>:

> You could also verify if output of "git remote -v show" is what is
> expected, but otherwise I have no idea.
>
> Or, if You want to test without url rewrite, then You could write
> following into the core/.git/config
>
> [remote "origin"]
> [..]
>        url = git://anongit.kde.org/digikam.git
>        pushurl = ssh://[hidden email]/digikam.git
>
> Gert
>
> On 7 February 2011 14:08, Gilles Caulier <[hidden email]> wrote:
>> 2011/2/7 Gert Kello <[hidden email]>:
>>>> [gilles@localhost core]$ git pull --rebase -v
>>>> fatal: The remote end hung up unexpectedly
>>>>
>>>
>>> a) It might be temporary problem at remote end.
>>> b) Can You give the output of "git branch -a"?
> _______________________________________________
> Digikam-devel mailing list
> [hidden email]
> https://mail.kde.org/mailman/listinfo/digikam-devel
>

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

Ah. I found something :

[gilles@localhost digikam-sc]$ pwd
/mnt/data/Devel/GIT/digikam-sc
[gilles@localhost digikam-sc]$ ls
bootstrap*      CMakeFiles/          CMakeLists.txt
cmake_uninstall.cmake  download-repos*      extra/  lib/      NEWS
CMakeCache.txt  cmake_install.cmake  CMakeTmp/       core/
     EnabledFeatures.txt  gits*   Makefile  README
[gilles@localhost digikam-sc]$ git pull
Already up-to-date.
[gilles@localhost digikam-sc]$ cd core
[gilles@localhost core]$ git pull
fatal: The remote end hung up unexpectedly

Look like if i try git pull from root dir, it work, and if i try it
from core sub-dir, it doesn't work.

The message from git is really annoying

Gilles

2011/2/7 Gilles Caulier <[hidden email]>:

> too strange :
>
> [gilles@localhost digikam-sc]$ git remote -v show
> origin  git://anongit.kde.org/scratch/mwiesweg/digikam-sc (fetch)
> origin  [hidden email]:scratch/mwiesweg/digikam-sc (push)
>
> Really git is obscure for me.
>
> Gilles
>
> 2011/2/7 Gert Kello <[hidden email]>:
>> You could also verify if output of "git remote -v show" is what is
>> expected, but otherwise I have no idea.
>>
>> Or, if You want to test without url rewrite, then You could write
>> following into the core/.git/config
>>
>> [remote "origin"]
>> [..]
>>        url = git://anongit.kde.org/digikam.git
>>        pushurl = ssh://[hidden email]/digikam.git
>>
>> Gert
>>
>> On 7 February 2011 14:08, Gilles Caulier <[hidden email]> wrote:
>>> 2011/2/7 Gert Kello <[hidden email]>:
>>>>> [gilles@localhost core]$ git pull --rebase -v
>>>>> fatal: The remote end hung up unexpectedly
>>>>>
>>>>
>>>> a) It might be temporary problem at remote end.
>>>> b) Can You give the output of "git branch -a"?
>> _______________________________________________
>> Digikam-devel mailing list
>> [hidden email]
>> https://mail.kde.org/mailman/listinfo/digikam-devel
>>
>

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

> Look like if i try git pull from root dir, it work, and if i try it
> from core sub-dir, it doesn't work.
>
> The message from git is really annoying

Did You verify the "git remote -v show" in core sub-dir?

Gert
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

yes:

[gilles@localhost core]$ git remote -v show
origin  git://anongit.kde.org///digikam (fetch)
origin  ssh://[hidden email]/digikam (push)

[gilles@localhost core]$ pwd
/mnt/data/Devel/GIT/digikam-sc/core

Gilles

2011/2/7 Gert Kello <[hidden email]>:

>> Look like if i try git pull from root dir, it work, and if i try it
>> from core sub-dir, it doesn't work.
>>
>> The message from git is really annoying
>
> Did You verify the "git remote -v show" in core sub-dir?
>
> Gert
> _______________________________________________
> Digikam-devel mailing list
> [hidden email]
> https://mail.kde.org/mailman/listinfo/digikam-devel
>

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

> [gilles@localhost core]$ git remote -v show
> origin  git://anongit.kde.org///digikam (fetch)
> origin  ssh://[hidden email]/digikam (push)

Not sure if three slashes in git://anongit.kde.org///digikam is Ok?

And I have git://anongit.kde.org/digikam.git (digikam.git vs digikam)

Gert
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Aditya Bhatt]

Hi,

I just tried cloning and got the same error as Gilles (after long waiting and a timeout):

fatal: The remote end hung up unexpectedly.

I think there's something wrong with the git server(s), this problem was still there while pulling 3-4 hours ago.

That said, it worked yesterday.

On Mon, Feb 7, 2011 at 6:40 PM, Gert Kello <[hidden email]> wrote:

> [gilles@localhost core]$ git remote -v show
> origin  git://anongit.kde.org///digikam (fetch)
> origin  ssh://git@.../digikam (push)

Not sure if three slashes in git://anongit.kde.org///digikam is Ok?

And I have git://anongit.kde.org/digikam.git (digikam.git vs digikam)

Gert
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

--
Adi

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[kunal ghosh]

Hi all,

In the past few posts i saw the use of "git"
eg, $git remote -v show

Right now, digikam core , and extras are separate repositories
and this forces us to use "gits" (git slave script - available in the top level directory digikam-sc)

gits is nothing but a wrapper script around git to make using a lot of different repositories
easy. So, there are a few cases where we must use "gits" instead of "git"
Quoting from the gits man page
"

The basic theory is that there are a few sub-commands (prepare, attach, populate) which help set up the meta-project for gits operations. Then, for any git command which is not file specific (git add <filename>; git reset <filename>; etc), you should use ``gits'' instead of ``git'', and the command will run on all repositories in the project.  

"

so ideally to pull in all the changes we must
$pwd
/home/kunal/workspace/digikam-GIT/digikam-sc
$./gits remote -v show
On: core:
  origin        git://anongit.kde.org/digikam (fetch)
  origin        ssh://git@.../digikam (push)
On: .:
  origin        git://anongit.kde.org/scratch/mwiesweg/digikam-sc (fetch)
  origin        [hidden email]:scratch/mwiesweg/digikam-sc (push)
On: extra/libkmap:
  origin        git://anongit.kde.org/libkmap (fetch)
  origin        ssh://git@.../libkmap (push)
On: extra/kipi-plugins:
  origin        git://anongit.kde.org/kipi-plugins (fetch)
  origin        ssh://git@.../kipi-plugins (push)
On: extra/libkface:
  origin        git://anongit.kde.org/libkface (fetch)
  origin        ssh://git@.../libkface (push)

On Mon, Feb 7, 2011 at 9:10 PM, Aditya Bhatt <[hidden email]> wrote:

Hi,

I just tried cloning and got the same error as Gilles (after long waiting and a timeout):

fatal: The remote end hung up unexpectedly.

I think there's something wrong with the git server(s), this problem was still there while pulling 3-4 hours ago.

That said, it worked yesterday.

On Mon, Feb 7, 2011 at 6:40 PM, Gert Kello <[hidden email]> wrote:

> [gilles@localhost core]$ git remote -v show
> origin  git://anongit.kde.org///digikam (fetch)
> origin  ssh://git@.../digikam (push)

Not sure if three slashes in git://anongit.kde.org///digikam is Ok?

And I have git://anongit.kde.org/digikam.git (digikam.git vs digikam)

Gert
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

--
Adi

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

--
regards
-------
Kunal Ghosh
Dept of Computer Sc. & Engineering.
Sir MVIT
Bangalore,India

permalink: member.acm.org/~kunal.t2

Blog:kunalghosh.wordpress.com
Website:www.kunalghosh.net46.net

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Marcel Wiesweg]

Hi Gilles,

very long thread ;-) But I see your commits, so you must have been successful.
Any problems left?

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

yes,

look in this thread, the pending problem is that i'm not able to
update local git from remote repository

typically, i clone properlly, i can edit and commit.

But when i want to update, using git pull, it doesn't work...

Gilles

2011/2/7 Marcel Wiesweg <[hidden email]>:

>
> Hi Gilles,
>
> very long thread ;-) But I see your commits, so you must have been successful.
> Any problems left?
>
> _______________________________________________
> Digikam-devel mailing list
> [hidden email]
> https://mail.kde.org/mailman/listinfo/digikam-devel
>

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Marcel Wiesweg]

> look in this thread, the pending problem is that i'm not able to
> update local git from remote repository
>
> typically, i clone properlly, i can edit and commit.
>
> But when i want to update, using git pull, it doesn't work...

Can you post or send me your .git/config (of the core repository) and your
~/.gitconfig?
I can simulate a problem when I have too many slashes in the repository path.
Granted, the error message "remote hung up" is pretty thin.

Marcel
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

Marcel,

Problem is "git up" alias to "git pull --rebase -v". this is my git
configuration from my home dir :

[gilles@localhost ~]$ pwd
/home/gilles
[gilles@localhost ~]$ cat .gitconfig
[url "git://anongit.kde.org/"]
        insteadOf = kde:

[url "[hidden email]:"]
        pushInsteadOf = kde:

[url "ssh://[hidden email]/"]
        pushinsteadof = kde://

[alias]
        up = pull --rebase -v
        ci = commit -a -v
[core]
        editor = mcedit
[user]
        name = Gilles Caulier
        email = [hidden email]
[push]
        default = tracking

Now if i try to use it from lead git dir, it work :

[gilles@localhost digikam-sc]$ pwd
/mnt/data/Devel/GIT/digikam-sc

[gilles@localhost digikam-sc]$ ls -al
total 352
drwxr-xr-x  8 gilles gilles   648 2011-02-07 14:48 ./
drwxr-xr-x  5 gilles gilles   128 2011-02-07 12:12 ../
-rwxr-xr-x  1 gilles gilles   349 2010-12-06 13:27 bootstrap*
-rw-r--r--  1 gilles gilles 90926 2011-02-07 14:21 CMakeCache.txt
drwxr-xr-x  6 gilles gilles   760 2011-02-07 14:50 CMakeFiles/
-rw-r--r--  1 gilles gilles  1867 2011-02-07 11:37 cmake_install.cmake
-rw-r--r--  1 gilles gilles  1764 2011-02-07 11:19 CMakeLists.txt
drwxr-xr-x  2 gilles gilles    88 2011-02-07 11:37 CMakeTmp/
-rw-r--r--  1 gilles gilles   892 2011-02-07 11:37 cmake_uninstall.cmake
drwxr-xr-x 16 gilles gilles  1296 2011-02-07 14:48 core/
-rwxr-xr-x  1 gilles gilles   300 2011-02-07 11:19 download-repos*
-rw-rw-rw-  1 gilles gilles   181 2011-02-07 14:48 EnabledFeatures.txt
drwxr-xr-x  6 gilles gilles   256 2011-02-07 14:48 extra/
drwxr-xr-x  8 gilles gilles   392 2011-02-08 09:53 .git/
-rw-r--r--  1 gilles gilles    53 2011-02-07 11:19 .gitignore
-rwxr-xr-x  1 gilles gilles 73867 2011-02-07 11:19 gits*
-rw-r--r--  1 gilles gilles   131 2011-02-07 11:19 .gitslave
-rw-rw-rw-  1 root   root   57710 2011-02-07 14:28
install_manifest.txt
drwxr-xr-x  2 gilles gilles  2472 2011-02-07 14:50 lib/
-rw-rw-r--  1 gilles gilles 79043 2011-02-07 14:48 Makefile
-rw-r--r--  1 gilles gilles    77 2011-02-07 11:19 NEWS
-rw-r--r--  1 gilles gilles   879 2011-02-07 11:19 README
[gilles@localhost digikam-sc]$

[gilles@localhost digikam-sc]$ git up
From git://anongit.kde.org/scratch/mwiesweg/digikam-sc
 = [up to date]      master     -> origin/master
Current branch master is up to date.

But of course it do not update core and extra sub-dirs. Now i try to
use it in "core" :

[gilles@localhost core]$ pwd
/mnt/data/Devel/GIT/digikam-sc/core

[gilles@localhost core]$ git up
fatal: The remote end hung up unexpectedly

In "extra" all is fine :

[gilles@localhost extra]$ pwd
/mnt/data/Devel/GIT/digikam-sc/extra
[gilles@localhost extra]$ ls -al
total 19
drwxr-xr-x  6 gilles gilles  256 2011-02-07 14:48 ./
drwxr-xr-x  8 gilles gilles  648 2011-02-07 14:48 ../
drwxr-xr-x  2 gilles gilles  128 2011-02-07 14:48 CMakeFiles/
-rw-r--r--  1 gilles gilles 1528 2011-02-07 11:37 cmake_install.cmake
-rw-r--r--  1 gilles gilles 1041 2011-02-07 11:19 CMakeLists.txt
drwxr-xr-x 36 gilles gilles 1632 2011-02-07 14:48 kipi-plugins/
drwxr-xr-x  8 gilles gilles  600 2011-02-07 14:48 libkface/
drwxr-xr-x 10 gilles gilles  632 2011-02-07 14:48 libkmap/
-rw-r--r--  1 gilles gilles 5602 2011-02-07 11:37 Makefile
[gilles@localhost extra]$ git up
From git://anongit.kde.org/scratch/mwiesweg/digikam-sc
 = [up to date]      master     -> origin/master
Current branch master is up to date.

in "kipi-plugins", it doesn't work :

[gilles@localhost kipi-plugins]$ pwd
/mnt/data/Devel/GIT/digikam-sc/extra/kipi-plugins
[gilles@localhost kipi-plugins]$ ls -al
total 1170
drwxr-xr-x 36 gilles gilles    1632 2011-02-07 14:48 ./
drwxr-xr-x  6 gilles gilles     256 2011-02-07 14:48 ../
drwxr-xr-x  3 gilles gilles    1008 2011-02-07 14:48 acquireimages/
drwxr-xr-x  4 gilles gilles    2720 2011-02-07 14:48 advancedslideshow/
-rw-r--r--  1 gilles gilles    3588 2011-02-07 11:20 AUTHORS
drwxr-xr-x  4 gilles gilles    3576 2011-02-07 14:48 batchprocessimages/
drwxr-xr-x  3 gilles gilles    1536 2011-02-07 14:48 calendar/
-rw-r--r--  1 gilles gilles 1029272 2011-02-07 11:20 ChangeLog
drwxr-xr-x  4 gilles gilles     104 2011-02-07 11:20 cmake/
drwxr-xr-x  4 gilles gilles     208 2011-02-07 14:48 CMakeFiles/
-rw-r--r--  1 gilles gilles    4059 2011-02-07 11:37 cmake_install.cmake
-rw-r--r--  1 gilles gilles   15433 2011-02-07 11:20 CMakeLists.txt
drwxr-xr-x  4 gilles gilles     248 2011-02-07 14:48 common/
-rw-r--r--  1 gilles gilles   18019 2011-02-07 11:20 COPYING
-rw-r--r--  1 gilles gilles    5605 2011-02-07 11:20 COPYING-ADOBE
-rw-r--r--  1 gilles gilles     923 2011-02-07 11:37 CTestTestfile.cmake
drwxr-xr-x  4 gilles gilles    1392 2011-02-07 14:48 debianscreenshots/
drwxr-xr-x  8 gilles gilles     400 2011-02-07 14:48 dngconverter/
drwxr-xr-x  8 gilles gilles    1280 2011-02-07 14:48 expoblending/
drwxr-xr-x  4 gilles gilles    1128 2011-02-07 14:48 facebook/
drwxr-xr-x  4 gilles gilles    1280 2011-02-07 14:48 flashexport/
drwxr-xr-x  4 gilles gilles    1608 2011-02-07 14:48 flickrexport/
drwxr-xr-x  4 gilles gilles    1296 2011-02-07 14:48 galleryexport/
drwxr-xr-x  8 gilles gilles     328 2011-02-07 11:20 .git/
drwxr-xr-x  8 gilles gilles    3560 2011-02-07 14:48 gpssync/
-rw-r--r--  1 gilles gilles   11155 2011-02-07 11:20 HACKING
drwxr-xr-x  4 gilles gilles    2096 2011-02-07 14:48 htmlexport/
drwxr-xr-x  5 gilles gilles     896 2011-02-07 14:48 imageviewer/
-rw-r--r--  1 gilles gilles      87 2011-02-07 11:20 INSTALL
drwxr-xr-x  3 gilles gilles     960 2011-02-07 14:48 ipodexport/
drwxr-xr-x  4 gilles gilles    1440 2011-02-07 14:48 jpeglossless/
drwxr-xr-x  3 gilles gilles    1064 2011-02-07 14:48 kioexportimport/
-rw-r--r--  1 gilles gilles     936 2011-02-07 11:37 kipi-plugins.lsm
-rw-r--r--  1 gilles gilles     971 2011-02-07 11:20 kipi-plugins.lsm.cmake
drwxr-xr-x  3 gilles gilles     512 2011-02-07 14:48 kopete/
-rw-r--r--  1 gilles gilles     171 2011-02-07 11:20 .krazy
-rw-r--r--  1 gilles gilles    7046 2011-02-07 11:37 Makefile
-rw-r--r--  1 gilles gilles     185 2011-02-07 11:20 Messages.sh
drwxr-xr-x  9 gilles gilles    1904 2011-02-07 14:48 metadataedit/
-rw-r--r--  1 gilles gilles     761 2011-02-07 11:20 NEWS
drwxr-xr-x  4 gilles gilles    1568 2011-02-07 14:48 picasawebexport/
drwxr-xr-x  4 gilles gilles     976 2011-02-07 14:48 piwigoexport/
drwxr-xr-x  4 gilles gilles    1936 2011-02-07 14:48 printimages/
drwxr-xr-x  4 gilles gilles     960 2011-02-07 11:20 project/
drwxr-xr-x  4 gilles gilles    1056 2011-02-07 14:48 rawconverter/
-rw-r--r--  1 gilles gilles    8096 2011-02-07 11:20 README
drwxr-xr-x  7 gilles gilles    1568 2011-02-07 14:48 removeredeyes/
drwxr-xr-x  3 gilles gilles    1096 2011-02-07 14:48 sendimages/
drwxr-xr-x  4 gilles gilles    1040 2011-02-07 14:48 shwup/
drwxr-xr-x  4 gilles gilles    1008 2011-02-07 14:48 smug/
-rw-r--r--  1 gilles gilles     641 2011-02-07 11:37 svnscript.cmake
drwxr-xr-x  4 gilles gilles     816 2011-02-07 14:48 timeadjust/
-rw-r--r--  1 gilles gilles    4755 2011-02-07 11:20 tips
-rw-r--r--  1 gilles gilles    1817 2011-02-07 11:20 TODO
drwxr-xr-x  2 gilles gilles     264 2011-02-07 11:20 wallpaper/
[gilles@localhost kipi-plugins]$ git up
fatal: The remote end hung up unexpectedly

Same problem in libkface :

[gilles@localhost libkface]$ pwd
/mnt/data/Devel/GIT/digikam-sc/extra/libkface
[gilles@localhost libkface]$ ls -al
total 74
drwxr-xr-x 8 gilles gilles   600 2011-02-07 14:48 ./
drwxr-xr-x 6 gilles gilles   256 2011-02-07 14:48 ../
-rw-r--r-- 1 gilles gilles   226 2011-02-07 11:20 AUTHORS
drwxr-xr-x 4 gilles gilles   104 2011-02-07 11:20 cmake/
drwxr-xr-x 3 gilles gilles   160 2011-02-07 14:48 CMakeFiles/
-rw-r--r-- 1 gilles gilles  2104 2011-02-07 11:37 cmake_install.cmake
-rw-r--r-- 1 gilles gilles  6255 2011-02-07 11:20 CMakeLists.txt
-rw-r--r-- 1 gilles gilles 18019 2011-02-07 11:20 COPYING
-rw-r--r-- 1 gilles gilles   335 2011-02-07 11:37 CTestTestfile.cmake
drwxr-xr-x 8 gilles gilles   328 2011-02-07 11:20 .git/
drwxr-xr-x 2 gilles gilles   520 2011-02-07 14:48 libface/
drwxr-xr-x 3 gilles gilles   832 2011-02-07 14:48 libkface/
-rw-r--r-- 1 gilles gilles   657 2011-02-07 11:37 libkface.lsm
-rw-r--r-- 1 gilles gilles   679 2011-02-07 11:20 libkface.lsm.cmake
-rw-r--r-- 1 gilles gilles   333 2011-02-07 11:37 libkface.pc
-rw-r--r-- 1 gilles gilles   424 2011-02-07 11:20 libkface.pc.cmake
-rw-r--r-- 1 gilles gilles  6241 2011-02-07 11:37 Makefile
-rw-r--r-- 1 gilles gilles   100 2011-02-07 11:20 NEWS
-rw-r--r-- 1 gilles gilles  2769 2011-02-07 11:20 README
drwxr-xr-x 5 gilles gilles   744 2011-02-07 14:48 test/
-rw-r--r-- 1 gilles gilles     0 2011-02-07 11:20 TODO
[gilles@localhost libkface]$ git up
fatal: The remote end hung up unexpectedly

...and libkmap :

[gilles@localhost libkmap]$ pwd
/mnt/data/Devel/GIT/digikam-sc/extra/libkmap
[gilles@localhost libkmap]$ ls -al
total 62
drwxr-xr-x 10 gilles gilles  632 2011-02-07 14:48 ./
drwxr-xr-x  6 gilles gilles  256 2011-02-07 14:48 ../
-rw-r--r--  1 gilles gilles  177 2011-02-07 11:20 AUTHORS
drwxr-xr-x  3 gilles gilles  496 2011-02-07 14:48 calibrator/
drwxr-xr-x  3 gilles gilles   72 2011-02-07 11:20 cmake/
drwxr-xr-x  3 gilles gilles  160 2011-02-07 14:48 CMakeFiles/
-rw-r--r--  1 gilles gilles 2351 2011-02-07 11:37 cmake_install.cmake
-rw-r--r--  1 gilles gilles 4128 2011-02-07 11:20 CMakeLists.txt
-rw-r--r--  1 gilles gilles  380 2011-02-07 11:37 CTestTestfile.cmake
drwxr-xr-x  3 gilles gilles 2000 2011-02-07 14:48 data/
drwxr-xr-x  3 gilles gilles  784 2011-02-07 14:48 demo/
drwxr-xr-x  8 gilles gilles  328 2011-02-07 11:20 .git/
drwxr-xr-x  3 gilles gilles 2496 2011-02-07 14:48 libkmap/
-rw-r--r--  1 gilles gilles  594 2011-02-07 11:37 libkmap.lsm
-rw-r--r--  1 gilles gilles  615 2011-02-07 11:20 libkmap.lsm.cmake
-rw-r--r--  1 gilles gilles  273 2011-02-07 11:37 libkmap.pc
-rw-r--r--  1 gilles gilles  363 2011-02-07 11:20 libkmap.pc.cmake
-rw-r--r--  1 gilles gilles 6230 2011-02-07 11:37 Makefile
-rwxr-xr-x  1 gilles gilles   57 2011-02-07 11:20 Messages.sh*
-rw-r--r--  1 gilles gilles 2874 2011-02-07 11:20 README
drwxr-xr-x  3 gilles gilles  528 2011-02-07 14:48 test/
-rw-r--r--  1 gilles gilles 3264 2011-02-07 11:20 TODO
[gilles@localhost libkmap]$ git up
fatal: The remote end hung up unexpectedly

Now, see below my config files from local repository sub-dir :

[gilles@localhost .git]$ pwd
/mnt/data/Devel/GIT/digikam-sc/.git
[gilles@localhost .git]$ cat config
[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        fetch = +refs/heads/*:refs/remotes/origin/*
        url = kde:scratch/mwiesweg/digikam-sc
[branch "master"]
        remote = origin
        merge = refs/heads/master

//-------------------------------------------------------------

[gilles@localhost .git]$ pwd
/mnt/data/Devel/GIT/digikam-sc/core/.git
[gilles@localhost .git]$ cat config
[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        fetch = +refs/heads/*:refs/remotes/origin/*
        url = kde://digikam
[branch "master"]
        remote = origin
        merge = refs/heads/master
[branch "2.0"]
        remote = origin
        merge = refs/heads/development/2.0

//-------------------------------------------------------------

[gilles@localhost .git]$ pwd
/mnt/data/Devel/GIT/digikam-sc/extra/kipi-plugins/.git
[gilles@localhost .git]$ cat config
[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        fetch = +refs/heads/*:refs/remotes/origin/*
        url = kde://kipi-plugins
[branch "master"]
        remote = origin
        merge = refs/heads/master
[branch "2.0"]
        remote = origin
        merge = refs/heads/development/2.0

//-------------------------------------------------------------

[gilles@localhost .git]$ pwd
/mnt/data/Devel/GIT/digikam-sc/extra/libkface/.git
[gilles@localhost .git]$ cat config
[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        fetch = +refs/heads/*:refs/remotes/origin/*
        url = kde://libkface
[branch "master"]
        remote = origin
        merge = refs/heads/master

//-------------------------------------------------------------

[gilles@localhost .git]$ pwd
/mnt/data/Devel/GIT/digikam-sc/extra/libkmap/.git
[gilles@localhost .git]$ cat config
[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        fetch = +refs/heads/*:refs/remotes/origin/*
        url = kde://libkmap
[branch "master"]
        remote = origin
        merge = refs/heads/master

Gilles
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

Sorry to step in, but

> Problem is "git up" alias to "git pull --rebase -v". this is my git
> configuration from my home dir :
>
> [gilles@localhost ~]$ pwd
> /home/gilles
> [gilles@localhost ~]$ cat .gitconfig
> [url "git://anongit.kde.org/"]
>        insteadOf = kde:
>
> [url "[hidden email]:"]
>        pushInsteadOf = kde:
>
> [url "ssh://[hidden email]/"]
>        pushinsteadof = kde://
>

I believe this "insteadof=kde:" causes problems
It should be "insteadOf = kde://"

And You have one extra "pushInsteadOf = kde:", I think it should be
removed, keep only the "pushinsteadof = kde://" one

Gert
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel