Skip to content

Fix flatpak git #1150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jeremypw wants to merge 3 commits into from
Closed

Fix flatpak git #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
818cd10
Ignore flatpak related files
jeremypw Dec 8, 2021
dcd9b5b
Provide all callbacks to Ggit.Diff.foreach ()
jeremypw Dec 8, 2021
27c6419
Merge branch 'master' into fix-flatpak-git
Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
build
src/config.vala
*flatpak*
*~

4 changes: 3 additions & 1 deletion src/Services/MonitoredRepository.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down