Skip to content

WIP: Fix merge --no-ff #98

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

Open
wants to merge 2 commits into
base: gh-pages
Choose a base branch
from
Open

WIP: Fix merge --no-ff #98

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd8c288
WIP: #83 add support for --no-ff with few commits
IanLee1521 Jul 9, 2017
8790c69
Fixes the new case, but breaks the normal --no-ff functionality
IanLee1521 Jul 9, 2017
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
14 changes: 10 additions & 4 deletions js/historyview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1416,15 +1416,21 @@ define(['d3'], function() {
throw new Error('Already up-to-date.');
} else if (noFF === true) {
var branchStartCommit = this.getCommit(mergeTarget.parent);
Copy link

@udovicic udovicic Nov 10, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing this, and following lines with:

var branchStartCommit = this.getCommit(mergeTarget.id);
var base = (currentCommit.isNoFFCommit === true) ? currentCommit.parent2 : null;

while (branchStartCommit.parent !== base && branchStartCommit.parent !== currentCommit.id) {
  branchStartCommit = this.getCommit(branchStartCommit.parent);
}

will fix several issues, but unfortunately still does not work as expected in some edge cases. Hope this helps

while (branchStartCommit.parent !== currentCommit.id) {
branchStartCommit = this.getCommit(branchStartCommit.parent);
console.dir(currentCommit);
console.dir(branchStartCommit);
if (branchStartCommit !== currentCommit) {
while (branchStartCommit.parent !== currentCommit.id) {
branchStartCommit = this.getCommit(branchStartCommit.parent);
console.dir(branchStartCommit);
}
}

branchStartCommit.isNoFFBranch = true;
branchStartCommit.isNoFFBranch = false;

console.dir(mergeTarget);
this.commit({
parent2: mergeTarget.id,
isNoFFCommit: true
// isNoFFCommit: true
}, 'Merge');
} else if (this.isAncestorOf(currentCommit.id, mergeTarget.id)) {
this.fastForward(mergeTarget);
Expand Down