Skip to content

Commit

Permalink
Merge pull request #235 from praqma-training/git-katas-issue-59
Browse files Browse the repository at this point in the history
changed how shell script could be sourced in katas
  • Loading branch information
JKrag committed Apr 15, 2020
2 parents 8c48cc7 + eb81702 commit bba8d07
Show file tree
Hide file tree
Showing 30 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion 3-way-merge/README.md
Expand Up @@ -2,7 +2,7 @@

## Setup

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## The task
You again live in your own branch, this time we will be doing a bit of juggling with branches, to show how lightweight branches are in git.
Expand Down
2 changes: 1 addition & 1 deletion advanced-rebase-interactive/README.md
Expand Up @@ -14,7 +14,7 @@ As this is an advanced exercise, there are no specific steps to follow and no si

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## Task

Expand Down
2 changes: 1 addition & 1 deletion amend/README.md
Expand Up @@ -6,7 +6,7 @@ Sometimes we just forget something obvious that we want to fix quickly.

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion bad-commit/README.md
Expand Up @@ -7,7 +7,7 @@ Find the commit and revert it using bisect.

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion basic-branching/README.md
@@ -1,7 +1,7 @@
# Git Kata: Basic Branching
## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## The task
You again live in your own branch, this time we will be doing a bit of juggling with branches, to show how lightweight branches are in git.
Expand Down
2 changes: 1 addition & 1 deletion basic-cleaning/README.md
Expand Up @@ -2,7 +2,7 @@

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## The task
You are working on a project that involves generated files. Say you are compiling C files into object files. Before checking out a new branch you want to start clean
Expand Down
2 changes: 1 addition & 1 deletion basic-commits/README.md
Expand Up @@ -7,7 +7,7 @@ You can look at the bottom of this file, if you have not yet done basic git conf

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion basic-revert/README.md
@@ -1,7 +1,7 @@
# Git Kata: Basic revert
## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion basic-staging/README.md
Expand Up @@ -14,7 +14,7 @@ We will also work with `git reset` to reset the staged changes of a file, and `g

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion basic-stashing/README.md
Expand Up @@ -2,7 +2,7 @@

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion bisect/README.md
Expand Up @@ -16,7 +16,7 @@ $ ./test.sh
```
## Setup:

1. Run `. setup.sh`
1. Run `source setup.sh`

## Tasks

Expand Down
2 changes: 1 addition & 1 deletion commit-on-wrong-branch-2/README.md
Expand Up @@ -12,7 +12,7 @@ the `master` branch instead of the feature branch.

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion commit-on-wrong-branch/README.md
@@ -1,7 +1,7 @@
# gitkatas
## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## Kata 5: Commit on wrong branch
This kata was shameless ripped off from [Git Katas](http://blog.schauderhaft.de/gitkata/)
Expand Down
2 changes: 1 addition & 1 deletion detached-head/README.md
Expand Up @@ -4,7 +4,7 @@ When a user ends up in a "detached head" state, this is a scary situation, but a

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion ff-merge/README.md
@@ -1,7 +1,7 @@
# Git Kata: Fast-forward Merge
## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion git-attributes/README.md
Expand Up @@ -9,7 +9,7 @@ are for GNU/Linux platforms and Mac.

## Setup:

1. Run `. setup.sh`
1. Run `source setup.sh`

## The task

Expand Down
2 changes: 1 addition & 1 deletion git-tag/README.md
@@ -1,7 +1,7 @@
# Git Kata: Tagging of the commits
## Setup:

1. Run `. setup.sh`
1. Run `source setup.sh`

## Motivation

Expand Down
2 changes: 1 addition & 1 deletion ignore/README.md
Expand Up @@ -10,7 +10,7 @@ If you want to signal to git that a file needs to be removed from git, but still

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion investigation/README.md
Expand Up @@ -10,7 +10,7 @@ Objects are stored in `<repository>/.git/objects` in subfolders matching the fir

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## Task

Expand Down
2 changes: 1 addition & 1 deletion merge-conflict/README.md
Expand Up @@ -2,7 +2,7 @@

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion merge-driver/README.md
Expand Up @@ -7,7 +7,7 @@ We'll do this by setting up `merge-tst-files.sh` as a _merge driver_ for `.tst`

## Setup:

1. Run `. setup.sh`
1. Run `source setup.sh`

## The task

Expand Down
2 changes: 1 addition & 1 deletion merge-mergesort/README.md
Expand Up @@ -9,7 +9,7 @@ The task is to look at the merge conflict, and solve it by editing the file acco

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion rebase-branch/README.md
@@ -1,7 +1,7 @@
# Git Kata: rebase branch

## Setup:
1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)


## The task
Expand Down
2 changes: 1 addition & 1 deletion rebase-exec/README.md
Expand Up @@ -2,7 +2,7 @@

## Setup

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## Task

Expand Down
2 changes: 1 addition & 1 deletion reorder-the-history/README.md
Expand Up @@ -6,7 +6,7 @@ You should fix this such that our `git log` looks great!

## Setup

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## Task

Expand Down
2 changes: 1 addition & 1 deletion reset/README.md
Expand Up @@ -5,7 +5,7 @@ We use reset to unstage change, but we can also do many more different things.

## Setup

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## Task

Expand Down
2 changes: 1 addition & 1 deletion reverted-merge/README.md
Expand Up @@ -16,7 +16,7 @@ production, you decide to revert the merge commit.

## Setup

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion save-my-commit/README.md
Expand Up @@ -4,7 +4,7 @@ Save it!

## Setup

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## The task
We just reset our commits. Try different ways to restore them.
Expand Down
2 changes: 1 addition & 1 deletion squashing/README.md
Expand Up @@ -10,7 +10,7 @@ While you are at it I would really like the ugly `\n` characters inside `file.tx

## Setup

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion submodules/README.md
Expand Up @@ -5,7 +5,7 @@ This allows you to grab source changes directly, as well as _pushing_ them back.

## Setup

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)

> NOTE: If running setup.sh on windows, you can run into problems by sourcing the setup script. Instead, run `./setup.sh`, and the folders would be created correctly.
Expand Down

0 comments on commit bba8d07

Please sign in to comment.