Commit 1511b431 authored by Ben Boeckel's avatar Ben Boeckel

gitsetup: update for gitlab-sync

Also removes gitlab-push in the process since isn't as useful with the
LFS workflow.
parent 1ca9ccfd
......@@ -135,7 +135,7 @@ Typically, one addresses issues by writing code. To start contributing to CMB:
7. Push commits in your topic branch to your fork in GitLab:
$ git gitlab-push
$ git push gitlab HEAD
For more information see: [Share a Topic][]
......
#!/usr/bin/env bash
cd "${BASH_SOURCE%/*}/.." &&
Utilities/GitSetup/setup-user && echo &&
Utilities/GitSetup/setup-hooks && echo &&
Utilities/GitSetup/setup-lfs && echo &&
Utilities/GitSetup/SetupGitAliases.sh && echo &&
(Utilities/GitSetup/setup-upstream ||
util/GitSetup/setup-user && echo &&
util/GitSetup/setup-hooks && echo &&
util/GitSetup/setup-lfs && echo &&
util/SetupGitAliases.sh && echo &&
(util/GitSetup/setup-upstream ||
echo 'Failed to setup origin. Run this again to retry.') && echo &&
(Utilities/GitSetup/setup-gitlab ||
(util/GitSetup/setup-gitlab ||
echo 'Failed to setup GitLab. Run this again to retry.') && echo &&
Utilities/GitSetup/tips
util/GitSetup/tips
# Rebase master by default
git config rebase.stat true
git config branch.master.rebase true
# Record the version of this setup so Scripts/pre-commit can check it.
SetupForDevelopment_VERSION=2
SetupForDevelopment_VERSION=3
git config hooks.SetupForDevelopment ${SetupForDevelopment_VERSION}
echo "Setting up SMTK's development environment..."
......
......@@ -6,7 +6,8 @@ echo "Setting up useful Git aliases..." &&
git config alias.pullall '!bash -c "git pull && git submodule update --init"' &&
git config alias.prepush 'log --graph --stat origin/master..' &&
# Alias to push the current topic branch to GitLab
git config alias.gitlab-push '!bash Utilities/GitSetup/git-gitlab-push' &&
( git config --unset alias.gitlab-push; true ) &&
# Alias to sync the current topic branch from GitLab
git config alias.gitlab-sync '!bash utilities/gitsetup/git-gitlab-sync' &&
true
......@@ -6,13 +6,13 @@ shopt -s dotglob
readonly name="gitsetup"
readonly ownership="GitSetup Upstream <kwrobot@kitware.com>"
readonly subtree="Utilities/GitSetup"
readonly subtree="util/GitSetup"
readonly repo="https://gitlab.kitware.com/utils/gitsetup.git"
readonly tag="setup"
readonly paths="
.gitattributes
git-gitlab-push
git-gitlab-sync
setup-gitlab
setup-hooks
setup-lfs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment