Omit abort on conflict skipping, if no cherry-pick is in progress

Checks whether any reverts or cherry-picks are in progress,
when user answers Yes to the "Continue from the next commit (Yes/no)?"
prompt when a the process runs into a merge conflict.

If there is no active revery or cherry-pick in progress, expect
that the conflict has been resolved by the user and continue
to the next commit without abort.

Previous, answering Yes, would invoke abort command, which would
fail if the user had already resolved conflicts. The previous workflow
expected that the user would answer no, and then run the git-draft
command again after the conflict had been resolved.

Now with this change, running the command again isn't necessary,
and it's enough to keep git-draft open on the background.

Closes #6

Author: gocom

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.3.0
+
+* Omit abort on conflict skipping, if no cherry-pick is in progress,
+  expecting that the user has already resolved the conflict and continue from
+  the next commit (closes #6).
+
 ## 0.2.0
 
 * Ability to revert commits with `--revert` option. Instead of cherry-picking

CONTRIBUTING.md

@@ -27,13 +27,13 @@ For available commands, see:
 $ make help
 ```
 
-Coding style
+Running linter and tests
 -----
 
-To verify that your additions follows coding style, run:
+To verify that your additions follow coding style and to execute tests, run:
 
 ```shell
-$ make lint
+$ make test
 ```
 
 Configure git

src/git-draft

@@ -168,7 +168,10 @@ fatal () {
 }
 
 pick () {
-  local selection hash
+  local selection hash git_directory
+
+  git_directory=$(git rev-parse --git-dir) \
+    || fatal "${red}✘${reset} Not inside a git directory."
 
   hashes "$@"
 
@@ -317,13 +320,17 @@ revert () {
 
   err "${red}✘${reset} Reverting ${yellow}$hash${reset} failed"
 
-  read -r -p "Skip and continue from the next commit (Yes/no)? " abort
+  read -r -p "Continue from the next commit (Yes/no)? " abort
 
   case "$abort" in
     Y*|y*)
-      run revert --abort \
-        || fatal "${red}✘${reset} Aborting revert failed"
-        ;;
+      if [ -f "${git_directory}/REVERT_HEAD" ]; then
+        run revert --abort \
+          || fatal "${red}✘${reset} Aborting revert failed"
+      else
+        log "${magenta}↯${reset} No revert in progress, continuing without abort"
+      fi
+      ;;
     *)
       fatal "${red}✘${reset} Exiting and leaving revert in progress"
       ;;
@@ -355,13 +362,17 @@ cherry-pick () {
 
   err "${red}✘${reset} Cherry-picking ${yellow}$hash${reset} failed"
 
-  read -r -p "Skip and continue from the next commit (Yes/no)? " abort
+  read -r -p "Continue from the next commit (Yes/no)? " abort
 
   case "$abort" in
     Y*|y*)
-      run cherry-pick --abort \
-        || fatal "${red}✘${reset} Aborting cherry-pick failed"
-        ;;
+      if [ -f "${git_directory}/CHERRY_PICK_HEAD" ]; then
+        run cherry-pick --abort \
+          || fatal "${red}✘${reset} Aborting cherry-pick failed"
+      else
+        log "${magenta}↯${reset} No cherry-pick in progress, continuing without abort"
+      fi
+      ;;
     *)
       fatal "${red}✘${reset} Exiting and leaving cherry-pick in progress"
       ;;