Skip to content

make branch name to merge a command line parameter #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nzjess wants to merge 1 commit into
base: master
Choose a base branch
from
Open

make branch name to merge a command line parameter #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions git-join-repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ self_name="$(basename $0)"
sed="sed"

if [ -z "$1" ]; then
echo "usage: $self_name filename (where filename is in format \"name url(\n)name url\")"
echo "usage: $self_name filename [branchname]"
echo " filename - where filename is in format \"name url(\n)name url\""
echo " branchname - name of branch to merge (default \"master\")"
Copy link
Member

@chrishiestand chrishiestand Jan 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's just set the default to main :-)

exit 99
fi

Expand All @@ -23,6 +25,7 @@ fi

data_file="$1"
name_urls="$(cat $data_file)"
branch_name="${2:-master}"
Copy link
Member

@chrishiestand chrishiestand Jan 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

default main

repo_name=
repo_url=

Expand All @@ -40,7 +43,7 @@ function split_line {
repo_url="${a#* }"
}

function repo_master_to_subdir {
function repo_branch_to_subdir {
git filter-branch -f --index-filter \
"git ls-files -s | ${sed} \"s|\t\\\"*|&${repo_name}/|\" |
GIT_INDEX_FILE=\$GIT_INDEX_FILE.new git update-index --index-info &&
Expand All @@ -59,12 +62,12 @@ for a in $name_urls; do
git rm -qrf --ignore-unmatch .
git remote add "$repo_name" "$repo_url"
git fetch "$repo_name"
git merge "$repo_name/master"
repo_master_to_subdir
git merge "$repo_name/$branch_name"
repo_branch_to_subdir
git remote remove "$repo_name"
done

git checkout --orphan master
git checkout --orphan $branch_name
git rm -qrf --ignore-unmatch .

for a in $name_urls; do
Expand Down