When downloading content from a remote repo,
git pull and
git fetch commands are available to accomplish the task. You can consider
git fetch the 'safe' version of the two commands. It will download the remote content but not update your local repo's working state, leaving your current work intact.
git pull is the more aggressive alternative; it will download the remote content for the active local branch and immediately execute
git merge to create a merge commit for the new remote content. If you have pending changes in progress this will cause conflicts and kick-off the merge conflict resolution flow.
Hoe git fetch werkt met externe branches
To better understand how
git fetch works let us discuss how Git organizes and stores commits. Behind the scenes, in the repository's
./.git/objects directory, Git stores all commits, local and remote. Git keeps remote and local branch commits distinctly separate through the use of branch refs. The refs for local branches are stored in the
./.git/refs/heads/. Executing the
git branch command will output a list of the local branch refs. The following is an example of
git branch output with some demo branch names.
Examining the contents of the
/.git/refs/heads/ directory would reveal similar output.
Remote branches are just like local branches, except they map to commits from somebody else’s repository. Remote branches are prefixed by the remote they belong to so that you don’t mix them up with local branches. Like local branches, Git also has refs for remote branches. Remote branch refs live in the
./.git/refs/remotes/ directory. The next example code snippet shows the branches you might see after fetching a remote repo conveniently named remote-repo:
git branch -r
This output displays the local branches we had previously examined but now displays them prefixed with
origin/. Additionally, we now see the remote branches prefixed with
remote-repo. You can check out a remote branch just like a local one, but this puts you in a detached
HEAD state (just like checking out an old commit). You can think of them as read-only branches. To view your remote branches, simply pass the
-r flag to the
git branch command.
You can inspect remote branches with the usual
git checkout and
git log commands. If you approve the changes a remote branch contains, you can merge it into a local branch with a normal
git merge. So, unlike SVN, synchronizing your local repository with a remote repository is actually a two-step process: fetch, then merge. The
git pull command is a convenient shortcut for this process.
Opdrachten en opties voor Git fetch
git fetch <remote>
Fetch all of the branches from the repository. This also downloads all of the required commits and files from the other repository.
git fetch <remote> <branch>
Same as the above command, but only fetch the specified branch.
git fetch --all
A power move which fetches all registered remotes and their branches:
git fetch --dry-run
--dry-run option will perform a demo run of the command. It will output examples of actions it will take during the fetch but not apply them.
Voorbeelden van Git fetch
Een externe branch git fetch-en
The following example will demonstrate how to fetch a remote branch and update your local working state to the remote contents. In this example, let us assume there is a central repo origin from which the local repository has been cloned from using the
git clone command. Let us also assume an additional remote repository named coworkers_repo that contains a feature_branch which we will configure and fetch. With these assumptions set let us continue the example.
Firstly we will need to configure the remote repo using the
git remote command.
git remote add coworkers_repo email@example.com:coworker/coworkers_repo.git
Here we have created a reference to the coworker's repo using the repo URL. We will now pass that remote name to
git fetch to download the contents.
git fetch coworkers_repo coworkers/feature_branch
git checkout coworkers/feature_branch
Note: checking out coworkers/feature_branch'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:
git checkout -b <new-branch-name>
The output from this checkout operation indicates that we are in a detached
HEAD state. This is expected and means that our
HEAD ref is pointing to a ref that is not in sequence with our local history. Being that
HEAD is pointed at the coworkers/feature_branch ref, we can create a new local branch from that ref. The 'detached
HEAD' output shows us how to do this using the
git checkout command:
git checkout -b local_feature_branch
Here we have created a new local branch named local_feature_branch. This puts updates
HEAD to point at the latest remote content and we can continue development on it from this point.
Oorsprong synchroniseren met git fetch
The following example walks through the typical workflow for synchronizing your local repository with the central repository's master branch.
git fetch origin
This will display the branches that were downloaded:
a1e8fb5..45e66a4 master -> origin/master
a1e8fb5..9e8ab1c develop -> origin/develop
* [new branch] some-feature -> origin/some-feature
The commits from these new remote branches are shown as squares instead of circles in the diagram below. As you can see,
git fetch gives you access to the entire branch structure of another repository.
To see what commits have been added to the upstream master, you can run a
git log using origin/master as a filter:
git log --oneline master..origin/master
To approve the changes and merge them into your local master branch use the following commands:
git checkout master
git log origin/master
Then we can use
git merge origin/master:
git merge origin/master
The origin/master and master branches now point to the same commit, and you are synchronized with the upstream developments.