Merge pull request #4 from justcoded/develop

lk-hotfix fixed, delete submodule added

Author: aprokopenko

CHANGELOG.md

@@ -9,6 +9,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ---
 <!--- END HEADER -->
 
+## [1.2.0](https://github.com/justcoded/git-extras/compare/v1.1.0...v1.2.0) (2022-05-16)
+### Features
+
+* Added delete-submodule extra
+
+### Bug Fixes
+
+* Lk-hotfix command doesn't work
+
+
+---
+
 ## [1.1.0](https://github.com/justcoded/git-extras/compare/v1.0.0...v1.1.0) (2022-05-13)
 ### Features
 

README.md

@@ -16,14 +16,14 @@ make install
 
 ## Commands reference
 
-| Command                             | Description                                                                                                                          |
-|-------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------|
-| `git browse`                        | Opens remote repository URL in browser. Taken from [git-extras](https://github.com/tj/git-extras).                                   |
-| `git set-config`                    | Configures repository with default global filemode (or 'false' by default) and push strategy.                                        |
-| `git set-gitflow`                   | Creates if not exists `develop`/`release` branches or sync them.                                                                     |
+| Command                             | Description                                                                                                                         |
+|-------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------|
+| `git browse`                        | Opens remote repository URL in browser. Taken from [git-extras](https://github.com/tj/git-extras).                                  |
+| `git set-config`                    | Configures repository with default global filemode (or 'false' by default) and push strategy.                                       |
+| `git set-gitflow`                   | Creates if not exists `develop`/`release` branches or sync them.                                                                    |
 | `git jc-feature <shortDescription>` | Defines git branching flow ("gitflow" or "feature branch") and creates Feature branch from the right branch (develop or main/master) |
-| `git jc-hotfix <shortDescription>`  | Creates Hotfix branch from `main`/`master` branch.                                                                                   |
-| `git lk-feature <shortDescription>` | Creates Feature branch from `release`.                                                                                               |
-| `git lk-epic <shortDescription>`    | Creates Epic branch from `release`.                                                                                                  |
-| `git lk-hotfix <shortDescription>`  | Creates Hotfix branch from `main`/`master` branch.                                                                                   |
-
+| `git jc-hotfix <shortDescription>`  | Creates Hotfix branch from `main`/`master` branch.                                                                                  |
+| `git lk-feature <shortDescription>` | Creates Feature branch from `release`.                                                                                              |
+| `git lk-epic <shortDescription>`    | Creates Epic branch from `release`.                                                                                                 |
+| `git lk-hotfix <shortDescription>`  | Creates Hotfix branch from `main`/`master` branch.                                                                                  |
+| `git delete-submodule`              | Deletes specified submodule. Taken from [git-extras](https://github.com/tj/git-extras).                                             |

bin/git-delete-submodule

@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+abort() {
+	error="$1" && shift
+	echo "ERROR: $*" 1>&2
+	test -z "$FORCE" && exit "$error"
+}
+
+# Don't abort on failures.  This allows to cleanup after a previous failure.
+[ "$1" = '--force' ] && FORCE=1 && shift
+
+test -z "$1"            && abort 1 'Submodule required'
+cd "$(git root)"        || abort 5 'Cannot change to repository root'
+test ! -f '.gitmodules' && abort 2 '.gitmodules file not found'
+
+NAME="${1%/}"
+test -z "$(git config --file='.gitmodules' "submodule.$NAME.url")" \
+	   && abort 3 'Submodule not found'
+
+# 1. Handle the .git directory
+# 1.a. Delete the relevant section from .git/config
+git submodule deinit -f "$NAME" || abort 4 "Failed to deinitialize $NAME"
+# 1.b. Delete empty submodule directory
+git rm -f "$NAME"
+
+# 2. Handle .gitmodules file
+# 2.a. Delete the relevant line from .gitmodules
+git config --file='.gitmodules' --remove-section "submodule.$NAME" 2>/dev/null || :
+# 2.b and stage changes
+git add '.gitmodules'
+# 2.c. Delete empty .gitmodules
+[  "$(wc -l '.gitmodules' | cut -d' ' -f1)" = '0' ] && git rm -f '.gitmodules'
+
+# 3. Need to confirm and commit the changes for yourself
+git_status_text="$(git submodule status 2>&1)"
+git_status_exit=$?
+if [ "$git_status_exit" -eq 0 ] \
+    && printf '%s' "DUMMY$git_status_text" | grep -v "$NAME" > /dev/null; then
+    #  grep fails when piping in an empty string, so we add a DUMMY prefix
+
+	echo "Successfully deleted $NAME."
+else
+	abort 6 "Failed to delete $NAME with error:\n$git_status_text"
+fi
+printf '\n%s\n' '== git submodule status =='
+printf '%s\n'   "$git_status_text"
+printf '%s\n'   '=========================='
+# shellcheck disable=SC2016
+echo 'Confirm the output of `git submodule status` above (if any)' \
+	'and then commit the changes.'

bin/git-lk-hotfix

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-git jc-hotfix "$@"
+git jc-branch -p hotfix/ -s master "$@"