File tree 1 file changed +10
-1
lines changed
1 file changed +10
-1
lines changed Original file line number Diff line number Diff line change @@ -48,7 +48,6 @@ for commit in $(git -C "$upstream_dir" log --first-parent --reverse --format="%H
48
48
# Always vendor tags
49
49
if [ $( git -C " $upstream_dir " describe --tags | grep -c -- -) -eq 0 ]; then
50
50
message=" chore: Update vendored sources (tag $( git -C " $upstream_dir " describe --tags) ) to duckdb/duckdb@$commit "
51
- changed=1
52
51
break
53
52
fi
54
53
@@ -65,6 +64,16 @@ if [ "$message" = "" ]; then
65
64
exit 0
66
65
fi
67
66
67
+ our_tag=$( git describe --tags --abbrev=0 | sed -r ' s/-[0-9]$//' )
68
+ upstream_tag=$( git -C " $upstream_dir " describe --tags --abbrev=0)
69
+
70
+ if [ " $our_tag " != " $upstream_tag " ]; then
71
+ echo " Not vendoring because our tag $our_tag is different from upstream tag $upstream_tag "
72
+ git checkout -- src/duckdb
73
+ rm -rf " $upstream_dir "
74
+ exit 0
75
+ fi
76
+
68
77
git add .
69
78
70
79
(
You can’t perform that action at this time.
0 commit comments