From a64e40dac33bdf1ca2a6d8f280724f08ad2b48ae Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Sun, 18 Feb 2018 19:53:29 +0100 Subject: [PATCH 1/2] Properly detect git in case of linked worktree --- util/gnc-vcs-info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/gnc-vcs-info b/util/gnc-vcs-info index 803d90520e..1e5658cc96 100755 --- a/util/gnc-vcs-info +++ b/util/gnc-vcs-info @@ -95,7 +95,7 @@ fi # Maybe it's git? real_gitdir="${real_srcdir}"/.git -if test -d "${real_gitdir}" +if test -d "${real_gitdir}" || test -e "${real_gitdir}" then # If we're only interested in the vcs type, then we're done here if [ "$request" = "type" ] From cf73c93bdf4a9ba0e87ca7b3b9d9952b073ecdf4 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Thu, 1 Mar 2018 19:58:07 +0100 Subject: [PATCH 2/2] Bug 792008 - gnucash 2.6.19 fails to build Replace g_assert_true with g_assert for now --- src/import-export/test/test-flat-bayes.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/import-export/test/test-flat-bayes.c b/src/import-export/test/test-flat-bayes.c index b00608b960..06f4319b88 100644 --- a/src/import-export/test/test-flat-bayes.c +++ b/src/import-export/test/test-flat-bayes.c @@ -171,7 +171,7 @@ group_account_name_and_guid_in_mixed_case (Fixture * fixture, gconstpointer pDat * If the grouping by account name and guid is *not* working properly, this test will fail. */ chosen = gnc_imap_find_account_bayes (fixture->map1, fixture->tokens1); - g_assert_true (chosen == fixture->account1); + g_assert (chosen == fixture->account1); } /* @@ -191,7 +191,7 @@ read_flat_bayes (Fixture * fixture, gconstpointer pData) kvp_frame_set_slot (frame, path, count_value); kvp_value_delete (count_value); chosen = gnc_imap_find_account_bayes (fixture->map1, fixture->tokens1); - g_assert_true (chosen == fixture->account1); + g_assert (chosen == fixture->account1); } static void @@ -208,7 +208,7 @@ write_flat_bayes (Fixture * fixture, gconstpointer pData) frame = qof_instance_get_slots (QOF_INSTANCE (fixture->account1)); count_value = kvp_frame_get_slot (frame, path); count = kvp_value_get_gint64 (count_value); - g_assert_true (count == 2); + g_assert (count == 2); } /* @@ -223,7 +223,7 @@ find_normal_bayes_account (Fixture * fixture, gconstpointer pData) gnc_imap_add_account_bayes (fixture->map1, fixture->tokens1, fixture->account1); gnc_imap_add_account_bayes (fixture->map1, fixture->tokens1, fixture->account1); acc = gnc_imap_find_account_bayes (fixture->map1, fixture->tokens1); - g_assert_true (acc == fixture->account1); + g_assert (acc == fixture->account1); } static void @@ -239,7 +239,7 @@ find_flat_bayes_account (Fixture * fixture, gconstpointer pData) gnc_imap_add_account_bayes (fixture->map1, fixture->tokens1, fixture->account1); gnc_imap_add_account_bayes (fixture->map1, fixture->tokens1, fixture->account2); acc = gnc_imap_find_account_bayes (fixture->map1, fixture->tokens1); - g_assert_true (acc == fixture->account1); + g_assert (acc == fixture->account1); } static void @@ -255,7 +255,7 @@ find_guid_bayes_account (Fixture * fixture, gconstpointer pData) gnc_imap_add_account_bayes (fixture->map1, fixture->tokens1, fixture->account1); gnc_imap_add_account_bayes (fixture->map1, fixture->tokens1, fixture->account2); acc = gnc_imap_find_account_bayes (fixture->map1, fixture->tokens1); - g_assert_true (acc == fixture->account1); + g_assert (acc == fixture->account1); } static void @@ -264,7 +264,7 @@ find_normal_bayes_when_non_exists (Fixture * fixture, gconstpointer pData) KvpFrame * frame; Account * acc; acc = gnc_imap_find_account_bayes (fixture->map1, fixture->tokens1); - g_assert_true (acc == NULL); + g_assert (acc == NULL); } static gchar const * suitename = "/import-export/test-flat-bayes";