GIT

Introduction

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.

Before starting a git-command, that affects your testsuite-files, a copy of these files will be created. They become the suffix ".last.sav".

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>.

Adding and Committing

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>.

Unstage

Removes an added testsuite from index. She is still modified, but not destined for commit.

 Executed git-command: git reset HEAD <testsuite-file>

Add All and Commit...

Adds all modified files and commits them in one step. You will be asked for input of a log-message.

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

Commit..

Commits all added files. 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>"

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.

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>.

Branches

Create Local Branch

Create a new local branch with a given name.

 Executed git-command: git checkout -b <Branchname>.

Checkout Branch...

Checks out a branch. 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 <Branchname>.

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 automatically merge by git isn't possibly, you can get merge-conflicts. To avoid this, better use Merge. If you get unresolvable conflicts, you can reset the files wit Merge Abort after Conflict and try it with Merge.

 Executed git-command: git pull.

Comparing and merging

Fetch

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

 Executed git-command: git fetch.

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

Merge with HEAD of the current branch (Only possible on remote-branches.)

You get the newest version of the current branch from the repository with the changes done by others. If there exists not automatically mergeable differences between the two version the Expecco-ProjectDifferenceBrowser will open and you can take over your changes.

 Executed git-command: git fetch                   
                       git merge      

Merge with Branch...

Merges the content of yout testsuite from another branch, you select in a dialog-box, to your testsuite-content.

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

 Executed git-command: git checkout <comparebranch>                   
                       git fetch
                       git checkout <currentbranch>
                       git merge

Merge Commit

You can finish the merge with a final 'Merge Commit. You maybe override changes from others.

 Executed git-command: git commit -a --no-edit

Merge Abort after Conflict

If you have unresolvable conflicts after pulling, you can abort the merge. You can retry the merge with Merge.

 Executed git-command: git merge --abort

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

• Drop branches.
• Use of the git-stash-command.

---

Copyright © 2014-2024 eXept Software AG