mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix local repo checkout bug

Browse source
This commit is contained in:
Jonas Höglund 2017-03-29 12:01:06 +02:00
parent e81f07831e
commit 1495b55d8e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iop/scripts/extract_core.sh
View file

@ -47,7 +47,7 @@ function extract_core {
mkdir -p patches mkdir -p patches
repo=$(basename $path) repo=$(basename $path)
dir=$(dirname $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 # Remove dirname from patches to commit the packages to the
# top directory in the destination repo. # top directory in the destination repo.
@ -67,7 +67,7 @@ function extract_core {
# Rebase and merge. # Rebase and merge.
git rebase origin/$repo git rebase origin/$repo
git checkout $repo git checkout --track -b $repo origin/$repo
git merge tmp git merge tmp
git br -d tmp git br -d tmp
else else