mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-07-11 15:14:27 +02:00
change '_.extend' to 'Object.assign'
This commit is contained in:
parent
7ae05ce932
commit
052aa1e299
13 changed files with 27 additions and 27 deletions
|
@ -518,7 +518,7 @@ GitEngine.prototype.getOrMakeRecursive = function(
|
|||
|
||||
if (type == 'HEAD') {
|
||||
var headJSON = tree.HEAD;
|
||||
var HEAD = new Ref(_.extend(
|
||||
var HEAD = new Ref(Object.assign(
|
||||
tree.HEAD,
|
||||
{
|
||||
target: this.getOrMakeRecursive(tree, createdSoFar, headJSON.target)
|
||||
|
@ -531,7 +531,7 @@ GitEngine.prototype.getOrMakeRecursive = function(
|
|||
if (type == 'branch') {
|
||||
var branchJSON = tree.branches[objID];
|
||||
|
||||
var branch = new Branch(_.extend(
|
||||
var branch = new Branch(Object.assign(
|
||||
tree.branches[objID],
|
||||
{
|
||||
target: this.getOrMakeRecursive(tree, createdSoFar, branchJSON.target)
|
||||
|
@ -544,7 +544,7 @@ GitEngine.prototype.getOrMakeRecursive = function(
|
|||
if (type == 'tag') {
|
||||
var tagJSON = tree.tags[objID];
|
||||
|
||||
var tag = new Tag(_.extend(
|
||||
var tag = new Tag(Object.assign(
|
||||
tree.tags[objID],
|
||||
{
|
||||
target: this.getOrMakeRecursive(tree, createdSoFar, tagJSON.target)
|
||||
|
@ -563,7 +563,7 @@ GitEngine.prototype.getOrMakeRecursive = function(
|
|||
parentObjs.push(this.getOrMakeRecursive(tree, createdSoFar, parentID));
|
||||
}, this);
|
||||
|
||||
var commit = new Commit(_.extend(
|
||||
var commit = new Commit(Object.assign(
|
||||
commitJSON,
|
||||
{
|
||||
parents: parentObjs,
|
||||
|
@ -846,7 +846,7 @@ GitEngine.prototype.makeCommit = function(parents, id, options) {
|
|||
id = this.getUniqueID();
|
||||
}
|
||||
|
||||
var commit = new Commit(_.extend({
|
||||
var commit = new Commit(Object.assign({
|
||||
parents: parents,
|
||||
id: id,
|
||||
gitVisuals: this.gitVisuals
|
||||
|
@ -1284,7 +1284,7 @@ GitEngine.prototype.fetchCore = function(sourceDestPairs, options) {
|
|||
this.origin,
|
||||
pair.destination,
|
||||
pair.source,
|
||||
_.extend(
|
||||
Object.assign(
|
||||
{},
|
||||
options,
|
||||
{dontThrowOnNoFetch: true}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue