Skip to content

Commit 3ecb923

Browse files
committed
aha
1 parent 72d5eb2 commit 3ecb923

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

RELEASES

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
0.76.7
1515
0.76.6
1616
0.76.5
17-
0.76.4
1817
0.76.3
1918
0.76.2
2019
0.76.1

scripts/new-release.sh

+7-10
Original file line numberDiff line numberDiff line change
@@ -106,34 +106,31 @@ function generateDiffs() {
106106
IFS=$'\n' GLOBIGNORE='*' command eval 'releases=($(cat "$ReleasesFile"))'
107107
for existingRelease in "${releases[@]}"; do
108108

109+
ignoreArgs=()
110+
for path in "${IgnorePaths[@]}"; do
111+
ignoreArgs+=(":!$path")
112+
done
113+
109114
result=0
110115
./scripts/compare-releases.js "$newRelease" "$existingRelease" || result=$?
111116

112117
case $result in
113118
1)
114119
echo "with later release $existingRelease: Generating diff file.."
115-
git diff --binary -w -M15% origin/release/"$newRelease"..origin/release/"$existingRelease" >wt-diffs/diffs/"$newRelease".."$existingRelease".diff
120+
git diff --binary -w -M15% origin/release/"$newRelease"..origin/release/"$existingRelease" -- . "${ignoreArgs[@]}" >wt-diffs/diffs/"$newRelease".."$existingRelease".diff
116121
;;
117122
2)
118123
echo "with same release $existingRelease: Skipping.."
119124
continue
120125
;;
121126
3)
122127
echo "with earlier release $existingRelease: Generating diff file.."
123-
git diff --binary -w -M15% origin/release/"$existingRelease"..origin/release/"$newRelease" >wt-diffs/diffs/"$existingRelease".."$newRelease".diff
128+
git diff --binary -w -M15% origin/release/"$existingRelease"..origin/release/"$newRelease" -- . "${ignoreArgs[@]}" >wt-diffs/diffs/"$existingRelease".."$newRelease".diff
124129
;;
125130
*)
126131
echo "Error: Unexpected return code $result from compare-releases.js"
127132
;;
128133
esac
129-
130-
ignoreArgs=()
131-
for path in "${IgnorePaths[@]}"; do
132-
ignoreArgs+=(":!$path")
133-
done
134-
135-
git diff --binary -w -M15% origin/release/"$existingRelease"..origin/release/"$newRelease" \
136-
-- . "${ignoreArgs[@]}" >wt-diffs/diffs/"$existingRelease".."$newRelease".diff
137134
done
138135

139136
cd wt-diffs

0 commit comments

Comments
 (0)