From d348d0459320b2661597175ed60f1080e65c5d16 Mon Sep 17 00:00:00 2001 From: inv Date: Thu, 3 Nov 2022 22:14:09 +0300 Subject: [PATCH] Update --- get.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/get.sh b/get.sh index 01fd074ec1..44a2af6353 100644 --- a/get.sh +++ b/get.sh @@ -1,9 +1,27 @@ #!/bin/bash + +problem_file=Adaptor2d_Curve2d.cxx + list="master integration" +echo "Getting branches hash" for name in $list ; do echo $name export shorthash_$name=$(git rev-parse $name) echo shorthash_$name=$(eval echo "\$shorthash_${name}") done -#echo shorthash_master=$shorthash_master +list=$(git rev-list --ancestry-path ${shorthash_master}..${shorthash_integration}) + +for hash in $list ; do + list_changed_files=$(git diff-tree --no-commit-id --name-only -r $hash | sed 's/\// /g' | awk '{ print $NF }') + for changed_file in $list_changed_files; do + echo problem_file=$problem_file + echo changed_file=$changed_file + if [ "$problem_file" == "$changed_file" ] ; then + echo Reverting: + echo $(git log -1 --format=oneline $hash) + # git revert $hash + git rebase --onto $hash^ $hash + fi + done +done \ No newline at end of file -- 2.39.5