frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle allow-unrelated-histories option on pull

Browse Source
This commit is contained in:
Nick O'Leary
2018-02-08 23:21:14 +00:00
parent d5619d2b9d
commit 06a6a4408f
5 changed files with 88 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
red/api/editor/projects/index.js
View File

@@ -353,8 +353,9 @@ module.exports = {
app.post("/:id/pull/?*", needsPermission("projects.write"), function(req,res) {
var projectName = req.params.id;
var remoteBranchName = req.params[0];
var setRemote = req.query.u;
runtime.storage.projects.pull(req.user, projectName,remoteBranchName,setRemote).then(function(data) {
var setUpstream = req.query.setUpstream;
var allowUnrelatedHistories = req.query.allowUnrelatedHistories;
runtime.storage.projects.pull(req.user, projectName,remoteBranchName,setUpstream,allowUnrelatedHistories).then(function(data) {
res.status(204).end();
})
.catch(function(err) {