summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Thiessen <alex.thiessen.de+coreboot@gmail.com>2018-01-13 18:52:18 +0000
committerPatrick Georgi <pgeorgi@google.com>2018-01-22 12:33:41 +0000
commit7459eeb18a2edfa098a189d8e1f9ab2a58a053e4 (patch)
tree716a2514ccc8371d5c2d6e4f96de9accf38a15ca
parenta90e5ebde43fe22e91ef934151d251b13bef6beb (diff)
downloadcoreboot-7459eeb18a2edfa098a189d8e1f9ab2a58a053e4.tar.xz
util/gitconfig: Update `sup-destroy` git alias
The `git sup-destroy` alias uses a subshell in order to make `git submodule deinit` deinitialize all submodules. This isn't necessary as the `--all` switch does the same. Furthermore, `git submodule init && git submodule update` equals to `git submodule --init`. Change-Id: Ib690d66795da4049bb0bb350a0609cf2e6b5c4c4 Signed-off-by: Alex Thiessen <alex.thiessen.de+coreboot@gmail.com> Reviewed-on: https://review.coreboot.org/23249 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rwxr-xr-xutil/gitconfig/gitconfig.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/util/gitconfig/gitconfig.sh b/util/gitconfig/gitconfig.sh
index 105bffc901..08451c177f 100755
--- a/util/gitconfig/gitconfig.sh
+++ b/util/gitconfig/gitconfig.sh
@@ -56,9 +56,8 @@ git config remote.origin.push HEAD:refs/for/master
git config alias.sup "!git submodule update --remote --rebase && \
git submodule update --init --checkout"
-git config alias.sup-destroy "!git submodule deinit --force \
-\"\$(git rev-parse --show-toplevel)\"; \
-git submodule init && git submodule update --checkout"
+git config alias.sup-destroy "!git submodule deinit --all --force; \
+git submodule update --init --checkout"
(git config --includes user.name >/dev/null && \
git config --includes user.email >/dev/null) || \