From 818cd109a22195d885f7900fa51bd67d4f9298f8 Mon Sep 17 00:00:00 2001 From: Jeremy Paul Wootten Date: Wed, 8 Dec 2021 15:21:25 +0000 Subject: [PATCH 1/2] Ignore flatpak related files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f57469ffc8..fa96862c6c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ build src/config.vala +*flatpak* *~ From dcd9b5be91912cbf4a7ec531395973c38f8a4495 Mon Sep 17 00:00:00 2001 From: Jeremy Paul Wootten Date: Wed, 8 Dec 2021 16:26:12 +0000 Subject: [PATCH 2/2] Provide all callbacks to Ggit.Diff.foreach () * Needed to work properly in Flatpak --- src/Services/MonitoredRepository.vala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Services/MonitoredRepository.vala b/src/Services/MonitoredRepository.vala index 9ecfe75325..95cd729fa1 100644 --- a/src/Services/MonitoredRepository.vala +++ b/src/Services/MonitoredRepository.vala @@ -269,7 +269,9 @@ namespace Scratch.Services { int prev_additions = 0; try { var repo_diff_list = new Ggit.Diff.index_to_workdir (git_repo, null, null); - repo_diff_list.foreach (null, null, null, + // To avoid error under Flatpak, need to provide all the callbacks even though nulls are accepted + // when running natively. + repo_diff_list.foreach (() => {return 0;}, () => {return 0;}, () => {return 0;}, (delta, hunk, line) => { unowned var file_diff = delta.get_old_file (); if (file_diff == null) {