Git Integration

To enable the integration:

1. Start GUI Client.

2. Click Add to create a new SCM configuration.

3. In the subsequent SCM Configuration dialog, specify the local source code location. For Git, this is not optional.

4. Select Git in the SCM drop-down list.

5. Several options will become available. These are specifically tailored to configure Git integration.

   Option	Description
   Git Executable	A full path referring the Git command line client (git.exe).
   Skip index	Defines whether the changes you upload via the "Add Changes" command should be taken from the working tree (including not-yet-committed changes) instead of from the index. This is an analogue of the git commit -a command.

   

6. Once ready, click Validate to make sure the integration is operational.

After that, a new configuration for Git will appear on the main screen of the GUI Client.

Select it, then click on the corresponding button depending on what you want to do next:

• Add Changes – Upload the modifications that are currently in the index. This action is an analog of the git commit command.

  

• Add Unpushed Commits – Select all commits on your local branch that have not been pushed to the tracking branch.

  Note:

  This option assumes you have configured branch tracking in Git. On any errors – for example, Error initializing local changelists – make sure your current branch has a tracking branch set. To create an initial setup for this, run the git config branch.autosetupmerge always command. To use the existing branch for tracking, run git branch --set-upstream my-branch my-upstream, replacing my-branch and my-upstream with your parameters.

  

• Add Commits – Upload commits, whether these have been pushed or not. To add a specific commit, specify its ID and click Add in the dialog.

  

• Add Git Diffs – Upload arbitrary Git diffs to the Collaborator server for review.

  

  On the Branches tab of the dialog, you can also upload the differences between two branches to a review. Specify the branches in the Before and After drop-down lists.

  

In the Command-Line Client, you can create a review for arbitrary Git diffs and changes to files that are present in the Git index.

For example, to create a new review and add all changes in the current directory and below, plus the foo.txt file, you can use the following command:

Commands recommended for Git

• ccollab addchanges – Attaches locally-modified files to a review.

• ccollab addchangelist – Attaches an atomic changelist to a review.

• ccollab addgitdiffs – Uploads differences generated by git diff command.

• ccollab gitaddbranch – Uploads all differences between the specified branch and the remote-tracking branch.

In most cases, the Command-Line Client can automatically detect your Git configuration. Try testing your configuration to verify the configuration is detected correctly.

If the Command-Line Client is unable to detect your Git configuration or you want to override the detected settings, you can manually specify Git settings using global options.

To manually configure the Command-Line Client to use Git, execute the following command:

Git-specific Options

Collaborator administrator can configure the Collaborator server to communicate directly with Git repositories. Server-side integration allows users to upload committed atomic changelists (commits in terms of Git) from the Web Client without having to install and configure client-side tools.

To upload changelists:

• Log in to Web Client.

• Create a new review, or open an existing one.

• Scroll to the Review Materials section of the Review Screen.

• Click Upload button and then select the item corresponding to the desired repository.

  Note:

  Item titles are specified by your Collaborator administrators and they will vary from those in the image below.

  

• In the ensuing dialog, specify the IDs of desired changelists. Separate multiple IDs by space character.

  

• Click Attach to upload the specified changelists to the review.

Configure Server-Side Integration