interdiff pr/mergeset.8 pr/mergeset.9

8-to-9.diff

Interdiff between pr/mergeset.8 and pr/mergeset.9
`diff <(git diff --no-color pr/mergeset.8~3..pr/mergeset.8) <(git diff --no-color pr/mergeset.9~3..pr/mergeset.9)`

2c2
< index ec3d81b76f..27fd14dea3 100644
---
> index 39e8d3d689..f4dcc52c31 100644
5c5
< @@ -209,6 +209,7 @@ BITCOIN_CORE_H = \
---
> @@ -208,6 +208,7 @@ BITCOIN_CORE_H = \
22c22
< index 1144ca8a78..9e9aeff722 100644
---
> index d3fe138133..54ba6a2e02 100644
25c25
< @@ -133,6 +133,7 @@ BITCOIN_TESTS =\
---
> @@ -134,6 +134,7 @@ BITCOIN_TESTS =\
35c35
< index 0000000000..c82ecaea8c
---
> index 0000000000..5078c2bc8e
38c38
< @@ -0,0 +1,158 @@
---
> @@ -0,0 +1,159 @@
49a50
> +#include <util/strencodings.h>
198c199
< index 8fee66d6c3..f42155ca16 100644
---
> index 9960573b33..cd2a983d1f 100644
201,202c202
< @@ -13,6 +13,7 @@
<  #include <test/setup_common.h>
---
> @@ -14,6 +14,7 @@
204a205
>  #include <thread>
209c210
< @@ -134,19 +135,58 @@ BOOST_AUTO_TEST_CASE(util_FormatISO8601Date)
---
> @@ -135,19 +136,58 @@ BOOST_AUTO_TEST_CASE(util_FormatISO8601Date)
269c270
< @@ -486,6 +526,7 @@ BOOST_AUTO_TEST_CASE(util_GetArg)
---
> @@ -487,6 +527,7 @@ BOOST_AUTO_TEST_CASE(util_GetArg)
512c513
< index 6925bda4ef..c40fc79873 100644
---
> index fca29a9f31..8aca1a7168 100644
515c516
< @@ -11,6 +11,7 @@
---
> @@ -9,6 +9,7 @@
523c524
< @@ -163,11 +164,14 @@ static bool InterpretBool(const std::string& strValue)
---
> @@ -161,11 +162,14 @@ static bool InterpretBool(const std::string& strValue)
540c541
< @@ -175,91 +179,19 @@ public:
---
> @@ -173,91 +177,19 @@ public:
641c642
< @@ -284,20 +216,17 @@ public:
---
> @@ -282,22 +214,19 @@ public:
667c668,669
<              LogPrintf("Warning: parsed potentially confusing double-negative %s=%s\n", key, val);
---
> -            LogPrintf("Warning: parsed potentially confusing double-negative %s=%s\n", key, val);
> +            LogPrintf("Warning: parsed potentially confusing double-negative -%s=%s\n", key, val);
669c671,673
< @@ -337,22 +266,9 @@ const std::set<std::string> ArgsManager::GetUnsuitableSectionOnlyArgs() const
---
>          } else {
>              return true;
> @@ -335,22 +264,9 @@ const std::set<std::string> ArgsManager::GetUnsuitableSectionOnlyArgs() const
695c699
< @@ -381,7 +297,7 @@ void ArgsManager::SelectConfigNetwork(const std::string& network)
---
> @@ -379,7 +295,7 @@ void ArgsManager::SelectConfigNetwork(const std::string& network)
704c708
< @@ -405,116 +321,91 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin
---
> @@ -403,116 +319,91 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin
859c863
< @@ -536,7 +427,7 @@ bool ArgsManager::SoftSetBoolArg(const std::string& strArg, bool fValue)
---
> @@ -534,7 +425,7 @@ bool ArgsManager::SoftSetBoolArg(const std::string& strArg, bool fValue)
868c872
< @@ -846,13 +737,14 @@ bool ArgsManager::ReadConfigStream(std::istream& stream, const std::string& file
---
> @@ -844,13 +735,14 @@ bool ArgsManager::ReadConfigStream(std::istream& stream, const std::string& file
887c891
< @@ -872,7 +764,7 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
---
> @@ -870,7 +762,7 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
896c900
< @@ -889,25 +781,31 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
---
> @@ -887,25 +779,31 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
942c946
< @@ -923,15 +821,14 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
---
> @@ -921,15 +819,14 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
962c966
< @@ -951,9 +848,13 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
---
> @@ -949,9 +846,13 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)

interdiff.sh

# Show the interdiff between tags $1 and $2
interdiff() {
  BASE_IDX_1=0
  while [ $(git cat-file -p ${1}~${BASE_IDX_1} | grep ^parent | wc -l) -lt 2 ]; do
    BASE_IDX_1=$((BASE_IDX_1 + 1))
  done

  BASE_IDX_2=0
  while [ $(git cat-file -p ${2}~${BASE_IDX_2} | grep ^parent | wc -l) -lt 2 ]; do
    BASE_IDX_2=$((BASE_IDX_2 + 1))
  done

  echo "Interdiff between ${1} and ${2}"
  echo "diff <(git diff --no-color ${1}~${BASE_IDX_1}..${1}) <(git diff --no-color ${2}~${BASE_IDX_2}..${2})"

  diff \
    <(git diff --no-color ${1}~${BASE_IDX_1}..${1}) <(git diff --no-color ${2}~${BASE_IDX_2}..${2})
}