mirror of
https://dev.iopsys.eu/feed/iopsys.git
synced 2025-12-10 07:44:50 +01:00
Fix local repo checkout bug
This commit is contained in:
parent
e81f07831e
commit
1495b55d8e
1 changed files with 2 additions and 2 deletions
|
|
@ -47,7 +47,7 @@ function extract_core {
|
|||
mkdir -p patches
|
||||
repo=$(basename $path)
|
||||
dir=$(dirname $path)
|
||||
git format-patch $initial_commit $path -o patches #> /dev/null
|
||||
git format-patch $initial_commit $path -o patches
|
||||
|
||||
# Remove dirname from patches to commit the packages to the
|
||||
# top directory in the destination repo.
|
||||
|
|
@ -67,7 +67,7 @@ function extract_core {
|
|||
|
||||
# Rebase and merge.
|
||||
git rebase origin/$repo
|
||||
git checkout $repo
|
||||
git checkout --track -b $repo origin/$repo
|
||||
git merge tmp
|
||||
git br -d tmp
|
||||
else
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue