projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
fc8dc94
)
Git.vala
author
Alan Knowles
<alan@roojs.com>
Fri, 15 Mar 2019 05:19:04 +0000
(13:19 +0800)
committer
Alan Knowles
<alan@roojs.com>
Fri, 15 Mar 2019 05:19:04 +0000
(13:19 +0800)
Git.vala
patch
|
blob
|
history
diff --git
a/Git.vala
b/Git.vala
index
e414879
..
8a53c36
100644
(file)
--- a/
Git.vala
+++ b/
Git.vala
@@
-126,6
+126,8
@@
namespace GitLive {
{
this.loadLocalBranches();
+
+
var oid = this.repo.revparse(this.head.get_name() ).get_id() ;
var moid = this.repo.revparse("refs/heads/master" ).get_id() ;
@@
-190,6
+192,7
@@
namespace GitLive {
public void mergeMasterIntoHead()
{
// assumes head is not master...
+ this.loadLocalBranches();
GLib.debug("head rev = %s", this.head.get_name());
var head_oid = this.repo.revparse(this.head.get_name() ).get_id() ;
var master_oid = this.repo.revparse("refs/heads/master" ).get_id() ;