[Digikam-devel] Re: how to use git as subversion
Gilles Caulier
caulier.gilles at gmail.com
Tue Feb 8 12:40:58 GMT 2011
Marcel,
Another question is how to concatenate git commands to one using git
alias. I would perform
#git commit -a -v ; git push
...at the same time...
I can create a shell alias, sure, but i would to know if it's possible
to do it directly with git.
Gilles
2011/2/8 Gilles Caulier <caulier.gilles at gmail.com>:
> Marcel,
>
> Problem is "git up" alias to "git pull --rebase -v". this is my git
> configuration from my home dir :
>
> [gilles at localhost ~]$ pwd
> /home/gilles
> [gilles at localhost ~]$ cat .gitconfig
> [url "git://anongit.kde.org/"]
> insteadOf = kde:
>
> [url "git at git.kde.org:"]
> pushInsteadOf = kde:
>
> [url "ssh://git@git.kde.org/"]
> pushinsteadof = kde://
>
> [alias]
> up = pull --rebase -v
> ci = commit -a -v
> [core]
> editor = mcedit
> [user]
> name = Gilles Caulier
> email = caulier.gilles at gmail.com
> [push]
> default = tracking
>
> Now if i try to use it from lead git dir, it work :
>
> [gilles at localhost digikam-sc]$ pwd
> /mnt/data/Devel/GIT/digikam-sc
>
> [gilles at 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 at localhost digikam-sc]$
>
> [gilles at 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 at localhost core]$ pwd
> /mnt/data/Devel/GIT/digikam-sc/core
>
> [gilles at localhost core]$ git up
> fatal: The remote end hung up unexpectedly
>
> In "extra" all is fine :
>
> [gilles at localhost extra]$ pwd
> /mnt/data/Devel/GIT/digikam-sc/extra
> [gilles at 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 at 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 at localhost kipi-plugins]$ pwd
> /mnt/data/Devel/GIT/digikam-sc/extra/kipi-plugins
> [gilles at 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 at localhost kipi-plugins]$ git up
> fatal: The remote end hung up unexpectedly
>
> Same problem in libkface :
>
> [gilles at localhost libkface]$ pwd
> /mnt/data/Devel/GIT/digikam-sc/extra/libkface
> [gilles at 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 at localhost libkface]$ git up
> fatal: The remote end hung up unexpectedly
>
> ...and libkmap :
>
> [gilles at localhost libkmap]$ pwd
> /mnt/data/Devel/GIT/digikam-sc/extra/libkmap
> [gilles at 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 at localhost libkmap]$ git up
> fatal: The remote end hung up unexpectedly
>
> Now, see below my config files from local repository sub-dir :
>
> [gilles at localhost .git]$ pwd
> /mnt/data/Devel/GIT/digikam-sc/.git
> [gilles at 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 at localhost .git]$ pwd
> /mnt/data/Devel/GIT/digikam-sc/core/.git
> [gilles at 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 at localhost .git]$ pwd
> /mnt/data/Devel/GIT/digikam-sc/extra/kipi-plugins/.git
> [gilles at 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 at localhost .git]$ pwd
> /mnt/data/Devel/GIT/digikam-sc/extra/libkface/.git
> [gilles at 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 at localhost .git]$ pwd
> /mnt/data/Devel/GIT/digikam-sc/extra/libkmap/.git
> [gilles at 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
>
More information about the Digikam-devel
mailing list