@@ -32,22 +32,21 @@ git --git-dir=msys2-runtime config remote.origin.partialCloneFilter blob:none &&
32
32
git --git-dir=msys2-runtime config remote.origin.fetch ' refs/tags/cygwin-*:refs/tags/cygwin-*' &&
33
33
git --git-dir=msys2-runtime fetch origin &&
34
34
35
- git clone --bare msys2-runtime src /msys2-runtime &&
36
- git --git-dir=src/msys2-runtime config remote.origin.url https://github.com/git-for-windows/msys2-runtime &&
37
- # pretend to be a partial clone
38
- git --git-dir=src/ msys2-runtime config remote.origin.promisor true &&
39
- git --git-dir=src/ msys2-runtime config remote.origin.partialCloneFilter blob:none ||
40
- die " Failed to initialize the src/ msys2-runtime repository"
35
+ git --git-dir= msys2-runtime config remote.g4w.url https://github.com/git-for-windows /msys2-runtime &&
36
+ # pretend to be a partially-cloned remote, too
37
+ git --git-dir=msys2-runtime config remote.g4w.promisor true &&
38
+ git --git-dir=msys2-runtime config remote.g4w.partialCloneFilter blob:none &&
39
+ git --git-dir=msys2-runtime fetch g4w $revision ||
40
+ die " Failed to initialize the msys2-runtime repository"
41
41
42
- git --git-dir=src/msys2-runtime reset --soft " $revision " &&
43
42
previous_commit=" $( cat msys2-runtime.commit) " && {
44
- test 0 = $( git --git-dir=src/ msys2-runtime rev-list --count " $revision ..$previous_commit " ) ||
43
+ test 0 = $( git --git-dir=msys2-runtime rev-list --count " $revision ..$previous_commit " ) ||
45
44
die " The revision $revision is not a direct descendant of $previous_commit "
46
45
} &&
47
46
48
47
# update pkgver if needed
49
48
update_pkgver= &&
50
- pkgver=$( git --git-dir=src/ msys2-runtime describe --match=' cygwin-[0-9]*' " $revision " ) &&
49
+ pkgver=$( git --git-dir=msys2-runtime describe --match=' cygwin-[0-9]*' " $revision " ) &&
51
50
pkgver=${pkgver# cygwin-} &&
52
51
pkgver=${pkgver%% -* } &&
53
52
if test " $pkgver " ! = " $( sed -n ' s/^pkgver=\(.*\)/\1/p' PKGBUILD) "
60
59
fi &&
61
60
62
61
# pre-fetch the required blobs
63
- git --git-dir=src/ msys2-runtime fetch origin \
64
- $( git --git-dir=src/ msys2-runtime -c core.abbrev=no \
62
+ git --git-dir=msys2-runtime fetch g4w \
63
+ $( git --git-dir=msys2-runtime -c core.abbrev=no \
65
64
log --format=' %n' --raw " refs/tags/cygwin-$pkgver ..$revision " ^" $revision ^{/^Start.the.merging-rebase}" |
66
65
cut -d ' ' -f 3,4 |
67
66
tr ' ' ' \n' |
68
67
grep -v ' ^0*$' |
69
68
sort |
70
69
uniq) &&
71
70
71
+ git --git-dir=msys2-runtime reset --soft " $revision " &&
72
+ git --git-dir=msys2-runtime worktree add --no-checkout src/msys2-runtime &&
73
+
72
74
sh -x ./update-patches.sh &&
73
75
if test -n " $update_pkgver "
74
76
then
0 commit comments