GIT

Preconditions

The plugin provides git-functionality for testsuites.

For proper work you need a remote-repository and access to it without entering user name and password.

Initialization

Administration Configuration

Sets the global git parameters for user name and mail-address.

 Executed git-command: git config --global user.name=<user name>, 
                       git config --global user.email=<mail address>.

Administration Clone

Provides the functionality of 'git clone': Cloning a repository into a a new local directory. A dialog asks for the url of the remote repository.

 Executed git-command: git clone <repository-url>.

Workflow

Add

Before you can commit your new or changed testsuite, you have add the file to the git index with the Add-command.

 Executed git-command: git add <testsuite-file>.

Commit

The added files you can commit to your local branch by using the Commit...-command. A message-box will appear to enter the commit-message. An empty commit-message is not allowed.

 Executed git-command: git commit -m "<log-message>".

• Add and commit...
  Combines the add- and commit-command.
  

 Executed git-commands: git add <Testsuite>
                        git commit -m "<log-message>".

• Commit (amend)
  Replace the tip of the current branch by creating a new commit. The new commit has the same parents and author as the current one.
  You should understand the implications of rewriting history if you amend a commit that has already been published!
  

 Executed git-command: git commit --amend.

Push

To publish your test-suite to the remote-repository you have to push it.

 Executed git-command: git push.

Pull

Incorporates changes from the remote repository into the current branch.

Because autoimatically merge by git isn't possibly, you can get merge-conflicts. To avoid this, better use Merge into newest Version of Branch.

 Executed git-command: git pull.

Fetch

Downloads objects and refs from the remote repository, but don't change the local files files.

 Executed git-command: git fetch.

Check out branch...

To change your working branch, use the Check out branch...-command. In a dialog you can choose the desired branch.

If you have uncommitted changes, git rejects the checkout of the new branch. You can discard (see below) or commit your changes and try again.

 Executed git-command: git checkout -b <branch>

Conflict handling

Discard changes in working directory

If you get conflicts by changing the branch, because you have uncommitted changes in your file, you can discard the changes. Attention: your changes are lost!

The other possibility is to commit your changes.

 Executed git-command: git checkout -- <Testsuite>.

Abort merge after conflict

If your branch and the remote-branch have diverged, you will get merge-conflicts after pulling from the repository. Because a git-merge isn't possible with exepecco-testsuite-files, you have to merge it with the expecco-ProjectDifferenceBrowser (see below). To get a proper state you first have to abort the merge.

 Executed git-command: git merge --abort.

Comparing and merging

You can compare and merge your testsuite in three different kinds.

In every case the Expecco-ProjectDifferenceBrowser will open. After merging you have to save, add and commit your testsuite (and then push).

Merge into newest Version of Branch

Merge with HEAD of the current branch.

You get the newest version of the current branch from the repository with the changes done by others and can take over the changes your changes.

This command doesn't switch the branch in your working directory.

 Executed git-command: git reset --hard @{upstream}                   
                       git pull      

Merge with branch...

Update your testsuite-content with the version of another branch, you select in a dialog.

This command doesn't switch the branch in your working directory.

 Executed git-command: git checkout <comparebranch>                   
                       git pull  (if remote-branch)
                       git checkout <currentbranch>

Merge into Branch...

Merge your testsuite-content into the version of another branch, you select in a dialog.

This command switches the branch in your working directory to the selected branch.

 Executed git-command: git checkout <comparebranch>                   
                       git pull  (if remote-branch)

Status dialogs

Show Log

Displays a dialog with the commit logs of the current branch.

 Executed git-command: git log

Show Status

Shows the working tree status.

 Executed git-command: git status

Not implemented

• Create and drop branches.
• Use of the git-stash-command.

---

Copyright © 2014-2024 eXept Software AG