mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-09-21 23:47:35 +03:00
baedc50567
Replaces the 'merge-and-update-solid' script with the simpler 'merge-with-custom-msg' which merges branches using a custom merge commit message. Maintainers may want to alias it locally via something like: git config alias.mu '!sh/merge-with-custom-msg' Then use it via: git mu SOME_BRANCH SOME_PR_NUMBER
50 lines
732 B
Bash
Executable File
50 lines
732 B
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
usage() {
|
|
local error="$1"
|
|
|
|
cat >&2 <<EOF
|
|
Usage:
|
|
$0 BRANCH PULL_REQUEST
|
|
|
|
Synopsis:
|
|
Useful script for merging a GitHub pull request with a custom merge commit
|
|
message.
|
|
|
|
Strips "origin" from branch names in title.
|
|
|
|
Example:
|
|
$0 origin/philip/jael-fix 1953
|
|
|
|
Yields:
|
|
|
|
Merge branch 'philip/jael-fix' (#1953)
|
|
|
|
* origin/philip/jael-fix:
|
|
jael: process all ships in %full update
|
|
|
|
Signed-off-by: Jared Tobin <jared@tlon.io>
|
|
|
|
Error:
|
|
-> $error
|
|
EOF
|
|
|
|
exit 1
|
|
}
|
|
|
|
args="$@"
|
|
|
|
if [[ -z "$args" ]]; then
|
|
usage "No arguments specified."
|
|
fi
|
|
|
|
REV=$1
|
|
PR=$2
|
|
|
|
TARGET=$(echo $REV | sed s_origin/__)
|
|
|
|
MERGE_MSG="Merge branch '$TARGET' (#$PR)"
|
|
|
|
git merge --no-ff --signoff --log -m "$MERGE_MSG" $REV
|
|
|