Activity Team/Git Activity Maintainer Walkthrough: Difference between revisions
No edit summary |
No edit summary |
||
| Line 43: | Line 43: | ||
:'''<godiard>''' i have "fatal: Not a git repository (or any of the parent directories): .git" | :'''<godiard>''' i have "fatal: Not a git repository (or any of the parent directories): .git" | ||
:'''<bernie>''' godiard: odd | :'''<bernie>''' godiard: odd | ||
:'''<godiard>''' bernie: i must do git init before git remote? | :'''<godiard>''' bernie: i must do git init before git remote? | ||
:'''<bernie>''' godiard: are you into the checkout dir? | :'''<bernie>''' godiard: are you into the checkout dir? | ||
| Line 69: | Line 68: | ||
:'''<bernie>''' godiard: a few days ago someone wasted a day because of this :-) | :'''<bernie>''' godiard: a few days ago someone wasted a day because of this :-) | ||
:'''<godiard>''' :) | :'''<godiard>''' :) | ||
:'''<Quozl>''' godiard: | :'''<Quozl>''' godiard: here is my .git/config where i commit to a non-mainline paint repo. | ||
[core] | |||
repositoryformatversion = 0 | |||
filemode = true | |||
bare = false | |||
logallrefupdates = true | |||
[remote "origin"] | |||
fetch = +refs/heads/*:refs/remotes/origin/* | |||
url = git://git.sugarlabs.org/paint/mainline.git | |||
[remote "quozl"] | |||
fetch = +refs/heads/*:refs/remotes/origin/* | |||
url = gitorious@git.sugarlabs.org:paint/quozl.git | |||
[branch "master"] | |||
remote = origin | |||
merge = refs/heads/master | |||
[push] | |||
default = matching | |||
:'''<godiard>''' can i acomment with # ? | :'''<godiard>''' can i acomment with # ? | ||
:'''<bernie>''' godiard: yep | :'''<bernie>''' godiard: yep | ||
| Line 125: | Line 140: | ||
:'''<bernie>''' godiard: because "master" is the name for the main branch in git, many repositories have it. but it's not obligatory | :'''<bernie>''' godiard: because "master" is the name for the main branch in git, many repositories have it. but it's not obligatory | ||
:'''<godiard>''' bernie: yes, i see my changes | :'''<godiard>''' bernie: yes, i see my changes | ||
:'''<Quozl>''' godiard: | :'''<Quozl>''' godiard: here ... shows me cloning mainline, adding my repo, fetching from my repo, and checking remote. | ||
* | $ cd /tmp | ||
$ git clone git://git.sugarlabs.org/paint/mainline.git paint.git | |||
Initialized empty Git repository in /tmp/paint.git/.git/ | |||
remote: Counting objects: 1480, done. | |||
remote: Compressing objects: 100% (599/599), done. | |||
remote: Total 1480 (delta 832), reused 1409 (delta 789) | |||
Receiving objects: 100% (1480/1480), 503.23 KiB | 108 KiB/s, done. | |||
Resolving deltas: 100% (832/832), done. | |||
$ cd paint.git | |||
$ git remote add quozl git://git.sugarlabs.org/paint/quozl.git | |||
$ git fetch quozl | |||
remote: Counting objects: 66, done. | |||
remote: Compressing objects: 100% (48/48), done. | |||
remote: Total 48 (delta 26), reused 0 (delta 0) | |||
Unpacking objects: 100% (48/48), done. | |||
From git://git.sugarlabs.org/paint/quozl | |||
* [new branch] master -> quozl/master | |||
* [new branch] trial-3 -> quozl/trial-3 | |||
$ git remote -v | |||
origin git://git.sugarlabs.org/paint/mainline.git (fetch) | |||
origin git://git.sugarlabs.org/paint/mainline.git (push) | |||
quozl git://git.sugarlabs.org/paint/quozl.git (fetch) | |||
quozl git://git.sugarlabs.org/paint/quozl.git (push) | |||
$ | |||
:'''<bernie>''' godiard: aren't the first commits different from the ones in mainline? | :'''<bernie>''' godiard: aren't the first commits different from the ones in mainline? | ||
:'''<Quozl>''' godiard: e430f2742f910d16a59318060bd39fc80e37822b for example has wrong author. | :'''<Quozl>''' godiard: e430f2742f910d16a59318060bd39fc80e37822b for example has wrong author. | ||