1
0
mirror of https://github.com/danog/gift.git synced 2024-11-26 20:04:47 +01:00

two bugs: repo#commit's optional options parameter and repo#sync's required branch parameter

This commit is contained in:
Yuest Wang 2012-04-29 19:36:05 +08:00
parent 6b759b7fbf
commit fbb3f3943b

View File

@ -215,6 +215,7 @@ module.exports = class Repo
# #
commit: (message, options, callback) -> commit: (message, options, callback) ->
[options, callback] = [callback, options] if !callback [options, callback] = [callback, options] if !callback
options ?= {}
options = _.extend options, {m: "'#{message}'"} options = _.extend options, {m: "'#{message}'"}
@git "commit", options, (err, stdout, stderr) -> @git "commit", options, (err, stdout, stderr) ->
callback err callback err
@ -246,7 +247,7 @@ module.exports = class Repo
# #
# callback - Receives `(err)`. # callback - Receives `(err)`.
# #
sync: (callback) -> sync: (branch, callback) ->
@git "stash", {}, ["save"], (err) => @git "stash", {}, ["save"], (err) =>
return callback err if err return callback err if err
@git "pull", {}, branch, (err) => @git "pull", {}, branch, (err) =>