development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

subtree: use named variables instead of "$@" in cmd_pull

Browse source 
'cmd_pull' already checks that only two arguments are given,
'repository' and 'ref'. Define variables with these names instead of
using the positional parameter $2 and "$@".

This will allow a subsequent commit to pass 'repository' to 'cmd_merge'.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Philippe Blain 2022-10-21 15:13:36 +00:00 committed by Junio C Hamano
parent 34ab458cb1
commit 7990142eb1
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/subtree/git-subtree.sh
View file

@ -1005,9 +1005,11 @@ cmd_pull () {
then
die "fatal: you must provide <repository> <ref>"
fi
repository="$1"
ref="$2"
ensure_clean
ensure_valid_ref_format "$2"
git fetch "$@" || exit $?
ensure_valid_ref_format "$ref"
git fetch "$repository" "$ref" || exit $?
cmd_merge FETCH_HEAD
}