mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-07 13:14:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modify GitEngine and add test

Browse source
This commit is contained in:
Cesar Costas 2022-11-30 01:07:09 +00:00 • committed by GitHub
parent 4471fc9595
commit e7fcf25566
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/js/git/index.js
View file

@ -2474,7 +2474,7 @@ GitEngine.prototype.merge = function(targetSource, options) {
});
}
if (this.isUpstreamOf(currentLocation, targetSource) && !options.noFF) {
if (this.isUpstreamOf(currentLocation, targetSource) && !options.noFF && !options.squash) {
// just set the target of this current location to the source
this.setTargetLocation(currentLocation, this.getCommitFromRef(targetSource));
// get fresh animation to happen
@ -2496,8 +2496,15 @@ GitEngine.prototype.merge = function(targetSource, options) {
);
// since we specify parent 1 as the first parent, it is the "main" parent
// and the node will be displayed below that branch / commit / whatever
var commitParents = [parent1];
if (!options.squash) {
// a squash commit doesn't include the reference to the second parent
commitParents.push(parent2);
}
var mergeCommit = this.makeCommit(
[parent1, parent2],
commitParents,
null,
{
commitMessage: msg