From 30c04e1cb6555bfc5997b2821b340e9c52266b57 Mon Sep 17 00:00:00 2001 From: Yongmin Hong Date: Thu, 9 May 2024 20:43:01 +0900 Subject: [PATCH] deploy.sh: add deploy commands Summary: Also change gitconfig and gitalias to be @ $HOME. Signed-off-by: Yongmin Hong Test Plan: Try `sh deploy.sh` AT YOUR OWN RISK. Reviewers: O1 revi & automations, revi Reviewed By: O1 revi & automations, revi Differential Revision: https://issuetracker.revi.xyz/D60 --- .editorconfig | 4 ++++ .gitaliases | 49 ++++++++++++++++++++++++++++------------------- default.gitconfig | 22 ++++++++++----------- deploy.sh | 24 +++++++++++++++++++++++ 4 files changed, 68 insertions(+), 31 deletions(-) create mode 100644 deploy.sh diff --git a/.editorconfig b/.editorconfig index e6565a2..107f395 100644 --- a/.editorconfig +++ b/.editorconfig @@ -31,6 +31,10 @@ indent_style = space indent_size = 2 indent_style = space +[.git*] +indent_size = 2 +indent_style = space + [.git/**] indent_size = 2 indent_style = space diff --git a/.gitaliases b/.gitaliases index bce051e..3882059 100644 --- a/.gitaliases +++ b/.gitaliases @@ -1,21 +1,30 @@ [alias] - co = checkout - cm = commit -s - st = status - br = branch -v - fa = fetch --all - graph = log --pretty=format:\"%h %s\" --graph - fo = fetch origin - usync = rebase upstream/master - osync = rebase origin/master - aal = add * - po = push origin master - amend = commit --amend -s - cmt = commit -S -s - amends = commit --amend -S -s - acmt = commit -a -S -s - acm = commit -a -s - fup = fetch upstream - com = checkout master - por = push origin - cob = checkout -b + co = checkout + cm = commit -s + st = status + br = branch -v + fa = fetch --all + graph = log --pretty=format:\"%h %s\" --graph + fo = fetch origin + usync = rebase upstream/master + usyncm = rebase upstream/main + osync = rebase origin/master + osyncm = rebase origin/main + aal = add * + po = push origin master + pom = push origin main + amend = commit --amend -s + cmt = commit -S -s + amends = commit --amend -S -s + acmt = commit -a -S -s + acm = commit -a -s + fup = fetch upstream + com = checkout master + comm = checkout main + por = push origin + cob = checkout -b +# below are non-git command, signified via `!` in the comment +# https://issuetracker.revi.xyz/u/gitalias + arcdiff = !arc diff + arcpatch = !arc patch + arcland = !arc land diff --git a/default.gitconfig b/default.gitconfig index 5dfe0b9..be6e35d 100644 --- a/default.gitconfig +++ b/default.gitconfig @@ -1,25 +1,25 @@ [user] name = Yongmin Hong - email = revi@omglol.email - signingkey = EA100E94 + email = revi@omglol.email + signingkey = EA100E94 [gitreview] username = revi [core] editor = nano [include] - path = ~/dots/.gitaliases + path = ~/.gitaliases [diff] - tool = default-difftool + tool = default-difftool [difftool "default-difftool"] - cmd = code --wait --diff $LOCAL $REMOTE + cmd = code --wait --diff $LOCAL $REMOTE [filter "lfs"] - clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f - process = git-lfs filter-process - required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true [sendemail] - smtpserver = smtp.fastmail.com - smtpuser = revi@omglol.email + smtpserver = smtp.fastmail.com + smtpuser = revi@omglol.email smtpencryption = tls smtpserverport = 587 [init] diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 0000000..6b8de30 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# Copyright 2024 Hong Yongmin + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +echo 'Now starting deploy script' + +# TODO: make it emit last commit hash, date and commit title + +echo 'Now copying git defaults' +cp default.gitignore ~/.gitignore +cp default.gitconfig ~/.gitconfig +cp .gitaliases ~/.gitaliases +