Skip to contentSkip to conversation

git workflow for casual developers

DISCUSSION Eliot Blennerhassett 3 participants 3 messages Jun 5, 2008 – Jun 6, 2008

lore
Share & tools
lore
#0 lore raw

Hi all,

So. we are now using git repositories. I'd better find out how to use git...

I plan to turn responses to this into a howto here
http://alsa-project.org/main/index.php/GIT_Server
I.e. what should someone do who is going to clone the repo, make a few changes, then email patches to a maintainer + alsa-devel?

0) clone the repository
git clone git://git.alsa-project.org/alsa-driver.git alsa-driver git clone git://git.alsa-project.org/alsa-kmirror.git alsa-kmirror

What should I do next if I want to make some changes? Here's what I did, or discovered I should have done :(

1) git-config --add user.email [email protected]
Otherwise commits get spurious email address for Author and Commiter (is there any way to fix this after the fact?)

2) should I create a branch in my cloned repo for my changes, or just go ahead and commit?
(I didn't create a branch)

3) How do I generate patches for my changes to the repo? Luckily for me there was a tag that was close enough so I could git-diff v1.0.17rc1

Should I really have used this as the "revision"?
git-diff remotes/origin/master

Then do this to generate the patchset
git-format-patch -s -n -p --subject-prefix="PATCH - my module" v1.0.17rc1

4) Check the patches /lib/modules/2.6.24-17-generic/build/scripts/checkpatch.pl --no-tree *.patch

5) Sending the patches
Make sure it knows how to send
git-config --add sendemail.smtpserver smtp.domain.com

git-send-email --from=me [email protected] [email protected] 000*.patch

6) OK, what have I missed?

regards

Signature · 3 lines
--
Eliot Blennerhassett
www.audioscience.com
#1 lore raw

At Thu, 05 Jun 2008 16:57:22 +1200,

Quoted 4 lines · Eliot Blennerhassett

1) git-config --add user.email [email protected]
Otherwise commits get spurious email address for Author and Commiter (is there any way to fix this after the fact?)

You need to re-commit the patch. For editing the tip commit log, you can use "git-commit --amend".

Quoted 3 lines

2) should I create a branch in my cloned repo for my changes, or just go ahead and commit?
(I didn't create a branch)

It's totally up to you. I prefer creating a patch or work on another tree to avoid unnecessary breakage via git-pull, though.

Quoted 6 lines

3) How do I generate patches for my changes to the repo? Luckily for me there was a tag that was close enough so I could git-diff v1.0.17rc1

Should I really have used this as the "revision"?
git-diff remotes/origin/master

Before submitting to the upstream, try to rebase to the latest upstream version. In my case, a typical workflow is like below:

	# suppose that we are working on master branch
	# fetch from the upstream
	% git-fetch origin
	# save the current branch
	% git-branch save
	# rebase to the latest upstream
	% git-rebase origin/master
	# if you got an error and want to rollback to the old tree...
	% git-reset --hard save
	# if no error and it's fine, remove the saved branch
	% git-branch -D save

Takashi

#2 lore raw
Quoted 8 lines · Takashi Iwai
Quoted 3 lines · Eliot Blennerhassett

1) git-config --add user.email [email protected]
Otherwise commits get spurious email address for Author and Commiter (is there any way to fix this after the fact?)

You need to re-commit the patch. For editing the tip commit log, you can use "git-commit --amend".

For non-tip commits the interactive mode of git rebase can be used to do this - select 'edit' for the commits you want to change.