dethos
/
rgit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

step fifty four: fast-forward merge

This commit is contained in:
Gonçalo Valério 2020-11-30 23:45:11 +00:00
parent 8060fab18e
commit 87418b8763
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/base.rs
View File

@ -285,10 +285,23 @@ pub fn merge(oid: String) {
assert!(head.value != "");
let merge_base = get_merge_base(oid.clone(), head.value.clone());
let c_base = get_commit(merge_base);
let c_head = get_commit(head.value);
let c_other = get_commit(oid.clone());
// Handle fast-forward merge
if merge_base == head.value {
read_tree(c_other.tree);
data::update_ref(
"HEAD".to_owned(),
data::RefValue {
symbolic: false,
value: oid,
},
true,
);
println!("Fast-forward merge, no need to commit");
return;
}
data::update_ref(
"MERGE_HEAD".to_owned(),
data::RefValue {
@ -298,6 +311,8 @@ pub fn merge(oid: String) {
true,
);
let c_base = get_commit(merge_base);
let c_head = get_commit(head.value);
read_tree_merged(c_base.tree, c_head.tree, c_other.tree);
println!("Merged in working tree");
println!("Please commit");