Skip to content

Commit

Permalink
Merge pull request #685 from dbic/enh-compare
Browse files Browse the repository at this point in the history
test-compare-two-versions.sh: also ignore differences in HeudiconvVersion field in jsons since we have it there now
  • Loading branch information
yarikoptic authored Jun 9, 2023
2 parents 7093ed4 + 35b101a commit 83c8424
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion utils/test-compare-two-versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function show_diff() {
#git remote add rolando "$outdir/rolando"
#git fetch rolando
# git diff --stat rolando/master..
if diff -Naur --exclude=.git --ignore-matching-lines='^\s*id\s*=.*' "$v1" "$v2" >| "$diff_full"; then
if diff -Naur --exclude=.git --ignore-matching-lines='^\s*\(id\s*=.*\|"HeudiconvVersion": \)' "$v1" "$v2" >| "$diff_full"; then
echo "Results are identical"
else
echo "Results differ: $diff_full"
Expand Down

0 comments on commit 83c8424

Please sign in to comment.