Git Integration

Version Control Integrations	Top \|Previous \|Next
Git Integration

This section describes Collaborator integration with Git:

Git Server Integration

The Collaborator server can pull commits directly from your Git repository for review, without users needing to install any client programs.

GUI Client

The GUI Client can upload arbitrary Git diffs and provides a special user interface for specifying branches as diff arguments. The GUI Client can also upload local changes to files that have been added to the Git index.

Command-Line Client

The Command-Line Client can upload arbitrary Git diffs and changes to files that have been added to the Git index.

Supported Versions

Our integration uses your own installed Git command line client executable to generate differences for review. We require Git v1.7.4 or later.

Because we use client applications already present on your computer, we support all protocols, authentications, proxies, and other client configuration options you are currently using.

NOTE: If you intend to add unpushed commits, you must have an upstream tracking branch set. You can tell Git and Collaborator which upstream branch to compare against by running the command:

git branch --set-upstream [localbranch] [upstreambranch]

Submodule Support

Currently Collaborator clients ignore submodule changes when adding changelists or diffs from the super project. Unlike clients, server side repository hosting integrations can display changes in the submodules of tracked repositories. So, to add the submodule differences you must either use repository hosting integration, or navigate into the submodule itself and add the files from there.

Technical Details and Limitations

Adding Git commits from GUI Client, Command-Line Client, Eclipse Plug-in or Visual Studio Extension will also add part of Git log information to build properly ordered list of changes on Collaborator server side. This will ensure that in Review Screen and Diff Viewer Git commits are displayed in the same order as in the Git log. To use this functionality you will need to update both server and clients to version 11.5 and later.

Collaborator does not guarantee that Diff Viewer will display correct comparison results for the following cases:

•	If you have "gaps" while adding subsequent atomic changelists (commits in terms of Git) to the same review. For example, add changelists 1, 2, and 4, but forget to add changelist 3.

•	If you add changelists from different branches or repositories to the same review.

•	If you add several diffs (non atomic changelists) to the same review.