development/gitg
development/gitg
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gitg synced 2024-10-02 14:13:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Ggit.Commit.amend to amend

Browse source
This commit is contained in:
Jesse van den Kieboom 2014-06-24 17:30:08 +02:00
parent 200a723d00
commit 682b31a609
1 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
libgitg/gitg-stage.vala
View file

@ -414,39 +414,39 @@ public class Stage : Object
headoid = head.resolve().get_target();
} catch {}
Ggit.OId[] parents;
if (!amend)
{
Ggit.OId[] parents;
if (headoid == null)
{
parents = new Ggit.OId[] {};
}
else
{
if (amend)
if (headoid == null)
{
var commit = d_repository.lookup<Ggit.Commit>(headoid);
var p = commit.get_parents();
parents = new Ggit.OId[p.size()];
for (int i = 0; i < p.size(); ++i)
{
parents[i] = p.get_id(i);
}
parents = new Ggit.OId[] {};
}
else
{
parents = new Ggit.OId[] { headoid };
}
}
ret = d_repository.create_commit_from_ids("HEAD",
author,
committer,
encoding,
emsg,
treeoid,
parents);
ret = d_repository.create_commit_from_ids("HEAD",
author,
committer,
encoding,
emsg,
treeoid,
parents);
}
else
{
var headcommit = d_repository.lookup<Ggit.Commit>(headoid);
var tree = d_repository.lookup<Ggit.Tree>(treeoid);
ret = headcommit.amend("HEAD",
author,
committer,
encoding,
emsg,
tree);
}
bool always_update = false;