m (→URL Renaming)
(Add gitexcludes file documentation, now that I've added it to kdelibs master (well, frameworks branch apparently))
|Line 66:||Line 66:|
git config commit.template .commit-template
git config commit.template .commit-template
=== Push Default ===
=== Push Default ===
Revision as of 05:29, 27 December 2011
How to set up Git for use in KDE.
To quickly set up git to just build a copy of KDE you do not need to perform any git configuration, however the following steps will simplify using Git:
If you plan to commit to a KDE repository using Git then you should follow all the steps on this page.
Your Git configuration operates at 3 levels:
The System Level sets up global Git configuration defaults for every User and Repository on your system. We will ignore these for our purposes as they are usually blank.
The User Level (aka Global) sets up the default configuration for a particular User to apply to all repositories used by that User. Settings made at this level will always override any matching System Level settings. The User Configuration is stored in your ~/.gitconfig file.
The Repository Level sets up the configuration for a particular Repository clone. Settings made at this level will always override any matching User or System Level settings. The Repository Configuration is stored in the repository .git/config file.
The recommended KDE Git Configuration will set some settings at a user level and some at a repository level. You may wish to change the level some settings apply at however as we will assume you only or mostly use Git for developing KDE.
You can set Git settings either by directly editing the config files, but it is far safer to use the git config command.
To set a Git setting at User level (i.e. in ~/.gitconfig):
git config --global <key> <value>
To set a Git setting at repo level (i.e in <repo>/.git/config):
cd <repo> git config <key> <value>
If you plan to commit to KDE Git, then you will need to set up git to use your identity.kde.org name and details to help identify your work:
git config --global user.name <Your Real Name> git config --global user.email <Your identity.kde.org email>
The name and email address you configure will be used as the author information for every commit you make. Note that in order for commit message keywords such as BUG and CCBUG to work, your Bugzilla account email address has to match the email address used in your commits.
To enable colored output when using git:
git config --global color.ui true
The Commit Template is a standard layout for commit messages, usually containing instructions for how a project expects messages to formatted and what details are to be included. You can choose to set a User Level template as a default, then use any project level variations at a repo level.
It is recommended to use the kdelibs template as your default. Once you have cloned kdelibs then set as follows to ensure you use the latest available version:
git config --global commit.template <path/to/kdelibs/>.commit-template
If you don't plan to have kdelibs cloned then download the kdelibs template from here, save as ~/.commit-template, and configure to use that copy:
git config --global commit.template ~/.commit-template
When cloning other KDE repositories, you should check to see if they have a project specific commit template, and if so you should set that at a repo level:
cd <repo> git config commit.template .commit-template
It's often necessary or desirable to limit the types of files that git will consider when commands like 'git status' and 'git add' or 'git add --all' are run. There are 2 types of exclusion rules.
The first, is a .gitignore in the repository. This text file will contain a list of wildcard expressions to ignore files and/or dirs. It can also contain bash-like comments (#) in addition to new lines.
The second method is similar to the first, except it is specified globally and will override (and add to) settings specified on a per-repository basis. This file can be named whatever, wherever, as long as it is specified in your ~/.gitconfig file.
An example .gitexcludes file can be found in kdelibs from here, save as ~/.gitexcludes, and configure to use that copy using:
git config --global core.excludesfile ~/.gitexcludes
or alternatively, edit ~/.gitconfig manually and specify:
[core] excludesfile = ~/.gitexcludes
Remember that this file is meant to be a global exclusion rule, so you probably shouldn't use it on a per-repo basis unless you really feel the need. The file excludes archive files (tar, gz, 7z, rar, etc.) as well as .directory, thumbs.db(Microsoft Windows file), .swp (swap file, used for vim and kate), as well as many many others.
It is recommended for new Git users to set the push default to nothing:
git config --global push.default nothing
This option forces you to always enter the name of the remote branch you wish to push to, rather than using a default value. This is good practice as it ensures you push to the correct remote branch and avoid accidentally pushing all local branches to the remote.
More experienced users may wish to set the option to tracking:
git config --global push.default tracking
This will default to push to the remote branch your local branch is tracking, but if you setup your local branch incorrectly you may still accidentally push to the wrong remote.
Instead of having to remember and type in the different full git addresses for pulling and pushing, we recommend you manually add the following to your Git User Configuration (~/.gitconfig):
[url "git://anongit.kde.org/"] insteadOf = kde: [url "[email protected]:"] pushInsteadOf = kde:
Bash auto-completion for Git commands and branches may or may not work out-of-the-box for you depending on how Git is installed on your system. To see if you have auto-completion already working type git on your command line followed by a space and hit the tab key twice. If you see a list of available git commands then you have Git auto-completion enabled.
If auto-completion does not work for you then you can download the git-completion.bash script and follow the instructions inside it.
If you have git-completion.bash installed, you can also add details like the branch name and dirty status to your command prompt, which will save repeated uses of git branch and git status.
To activate this, you need to add the following to your $PS1 environment variable:
$(__git_ps1 " (%s)")
Note that in the " (%s)" part the %s variable is replaced with the branch name, the rest of the text between the quotes is up to you.
If you have not set a PS1 value yourself, then you are likely to be using your distro default value which you can find out by typing:
To change this for your user, edit your .bashrc and copy the result of the echo command into there, then change it to add the Git branch.
For example, if echo $PS1 shows:
$(ppwd \l)\[email protected]\h:\w>
then add the following to your .bashrc:
PS1='$(ppwd \l)\[email protected]\h:\w$(__git_ps1 " (%s)")> '
which will show your prompt as follows:
[email protected]:~/kde/src/trunk/KDE/kdelibs (master + u+2)>
You can learn more about customizing your bash prompt at http://www.tldp.org/HOWTO/Bash-Prompt-HOWTO/.
You can also have the prompt show the 'dirty' status of your repo, i.e. if you have uncommited changes, and whether your branch differs from upstream HEAD:
- * = unstaged changes
- + = staged changes
- $ = stashed changes
- % = untracked files
- u-1 = behind upstream by 1 commit
- u+2 = ahead of upstream by 2 commits
- u= = same as upstream
To enable showing the dirty (unstaged/staged) state, add the following line to your .bashrc 'before' your PS1 setting:
To enable showing the stashed state, add the following line to your .bashrc before your PS1 setting:
To enable showing the untracked state, add the following line to your .bashrc before your PS1 setting:
To enable showing the upstream state, add the following line to your .bashrc before your PS1 setting:
export GIT_PS1_SHOWUPSTREAM="auto verbose"
To not show the number of commits ahead or behind remove the "verbose" flag.
To disable showing the dirty state for any one repo:
cd <repo> git config bash.showDirtyState false
To disable showing the upstream state for any one repo:
cd <repo> git config bash.showUpstream false
Multiple Work Branches
You will often want to have more than one build environment in parallel, for example if you want to work on both stable and unstable branches at the same time.
With Git you can easily have many work branches in your repository and easily switch between them. The problem here however is that you can only work on the one branch at a time, and switching branches will usually trigger a massive rebuild of the entire repository.
One solution would be to have a separate repository clone for each branch you wish to work on in parallel, but this takes up more disk space, the clones and branches can easily get out-of-sync, and it makes forward/back porting bug fixes between branches more difficult. If choosing this method then you should make each new clone from your initial local clone rather than from the main repo as this will be quicker.
The ideal solution is for a single git repository clone to provide separate source directories for each branch you wish to work on. This can be achieved using the git-new-workdir script provided in the Git contrib directory. This script uses sym-links to create what appears as a new clone in a separate folder but actually uses the same local clone.
The git-new-workdir script may be installed as part of your system git. If not download the script from the git repo and install in your ~/.bin.
For example, assuming your have a kdelibs.git clone living in ~/kde/src/master/kdelibs, then the following command will create a 4.6 work branch in ~/kde/src/4.6/kdelibs:
git-new-workdir ~/kde/src/master/kdelibs ~/kde/src/4.6/kdelibs KDE/4.6
RSA Key fingerprint for git.kde.org