melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve mfadd helper script

Browse Source 
- Use the original branch name if none is supplied
- Set the remote tracking to the source
- Accept User/Branch or User:Branch syntax
This commit is contained in:
Scott Lahteine 2020-02-01 00:27:11 -06:00
parent 9a8de23858
commit 1af05797d7
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
buildroot/share/git/mfadd
View File

@ -1,20 +1,24 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# #
# mfadd (user|ref) [copyname] # mfadd user[:branch] [copyname]
# #
# Add a remote and fetch it. Optionally copy a branch. # Add a remote and fetch it. Optionally copy a branch.
# #
# Example: mfadd myfork:patch-1 copy_of_patch-1 # Examples:
# mfadd thefork
# mfadd thefork:patch-1
# mfadd thefork:patch-1 the_patch_12345
# #
[[ $# > 0 && $# < 3 && $1 != "-h" && $1 != "--help" ]] || { echo "usage: `basename $0` (user|ref) [copyname]" 1>&2 ; exit 1; } [[ $# > 0 && $# < 3 && $1 != "-h" && $1 != "--help" ]] || { echo "usage: `basename $0` user[:branch] [copyname]" 1>&2 ; exit 1; }
# If a colon is included, split the parts # If a colon or slash is included, split the parts
if [[ $1 =~ ":" ]]; then if [[ $1 =~ ":" || $1 =~ "/" ]]; then
IFS=':' read -a DATA <<< "$1" [[ $1 =~ ":" ]] && IFS=':' || IFS="/"
read -a DATA <<< "$1"
USER=${DATA[0]} USER=${DATA[0]}
BRANCH=${DATA[1]} BRANCH=${DATA[1]}
NAME=$2 NAME=${2:-$BRANCH}
else else
USER=$1 USER=$1
fi fi
@ -29,4 +33,4 @@ echo "Adding and fetching $USER..."
git remote add "$USER" "git@github.com:$USER/$REPO.git" >/dev/null 2>&1 || echo "Remote exists." git remote add "$USER" "git@github.com:$USER/$REPO.git" >/dev/null 2>&1 || echo "Remote exists."
git fetch "$USER" git fetch "$USER"
[[ ! -z "$BRANCH" && ! -z "$NAME" ]] && git checkout $USER/$BRANCH -b $NAME [[ ! -z "$BRANCH" && ! -z "$NAME" ]] && git checkout -b "$NAME" --track "$USER/$BRANCH"