Skip to content

Commit

Permalink
Show WORK_BRANCH status after checkouting
Browse files Browse the repository at this point in the history
This change gives the ability to see the actual state of WORK_BRANCH
once it is updated. This should be useful verbosity to the overall process.
  • Loading branch information
extsoft committed Jul 30, 2019
1 parent 5003bb1 commit f2338a4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions docs/commands.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ A sequence of original `git` commands:
```bash
git fetch --all --tags
git checkout --force -B __eg <remote-branch-name>
git status
git rebase origin/master
git checkout master
git merge --ff-only __eg
Expand Down
1 change: 1 addition & 0 deletions libexec/git-elegant-accept-work
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ default() {
local WORK_BRANCH="__eg"
boxtee git fetch --all --tags
boxtee git checkout --force -B ${WORK_BRANCH} ${WORK}
boxtee git status
boxtee git rebase ${RMASTER}
# @todo #137 Alternative flows of `accept-work`
# If this command is executed with `${WORK_BRANCH}` and
Expand Down
1 change: 1 addition & 0 deletions tests/git-elegant-accept-work.bats
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ teardown() {
@test "'accept-work': a work is accepted successfully for given remote branch" {
fake-pass git "fetch --all --tags"
fake-pass git "checkout --force -B __eg origin/work"
fake-pass git "status"
fake-pass git "rebase origin/master"
fake-pass git "checkout master"
fake-pass git "merge --ff-only __eg"
Expand Down

0 comments on commit f2338a4

Please sign in to comment.