mirror of
https://gitlab.gnome.org/GNOME/gitg
synced 2024-08-27 20:09:23 +00:00
Fix for api breaks in libgit2-glib
This commit is contained in:
parent
89c4f65b6d
commit
325c1306d9
|
@ -145,7 +145,7 @@ namespace GitgGtk
|
|||
{
|
||||
Ref? reference = repo.lookup_reference("refs/heads/" + branch_name);
|
||||
|
||||
if (reference != null && reference.get_id().equal(head.get_id()))
|
||||
if (reference != null && reference.get_target().equal(head.get_target()))
|
||||
{
|
||||
data.branch_label.set_text(branch_name);
|
||||
return 1;
|
||||
|
|
|
@ -274,16 +274,16 @@ namespace GitgGtk
|
|||
if (i == 0)
|
||||
{
|
||||
d_diff = new Ggit.Diff.tree_to_tree(repo,
|
||||
options,
|
||||
parent.get_tree(),
|
||||
d_commit.get_tree());
|
||||
d_commit.get_tree(),
|
||||
options);
|
||||
}
|
||||
else
|
||||
{
|
||||
var d = new Ggit.Diff.tree_to_tree(repo,
|
||||
options,
|
||||
parent.get_tree(),
|
||||
d_commit.get_tree());
|
||||
d_commit.get_tree(),
|
||||
options);
|
||||
|
||||
d_diff.merge(d);
|
||||
}
|
||||
|
|
|
@ -80,7 +80,7 @@ public class Repository : Ggit.Repository
|
|||
return 0;
|
||||
}
|
||||
|
||||
Ggit.OId? id = r.get_id();
|
||||
Ggit.OId? id = r.get_target();
|
||||
|
||||
if (id == null)
|
||||
{
|
||||
|
|
|
@ -119,7 +119,7 @@ public class TreeStore : Gtk.TreeStore
|
|||
|
||||
try
|
||||
{
|
||||
d_tree.walk((root, entry) => {
|
||||
d_tree.walk(Ggit.TreeWalkMode.PRE, (root, entry) => {
|
||||
var attr = entry.get_file_mode();
|
||||
var isdir = attr == Ggit.FileMode.TREE;
|
||||
|
||||
|
@ -175,7 +175,7 @@ public class TreeStore : Gtk.TreeStore
|
|||
}
|
||||
|
||||
return 0;
|
||||
}, Ggit.TreeWalkMode.PRE);
|
||||
});
|
||||
} catch (Error e) { }
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue