Skip to content

Commit ec15816

Browse files
author
John Haley
committed
Fix incorrectly sync'ed methods in Repository
1 parent 1dc14b2 commit ec15816

File tree

2 files changed

+33
-21
lines changed

2 files changed

+33
-21
lines changed

api/index.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1402,7 +1402,7 @@ sections:
14021402
| [<span>Repository#</span>checkoutBranch <span>(branch, opts)</span>](/api/repository/#checkoutBranch) | <span class="tags"><span class="async">Async</span></span> |
14031403
| [<span>Repository#</span>config <span>()</span>](/api/repository/#config) | <span class="tags"><span class="async">Async</span></span> |
14041404
| [<span>Repository#</span>configSnapshot <span>()</span>](/api/repository/#configSnapshot) | <span class="tags"><span class="async">Async</span></span> |
1405-
| [<span>Repository#</span>continueRebase <span>(signature, beforeNextFn)</span>](/api/repository/#continueRebase) | <span class="tags"><span class="sync">Sync</span></span> |
1405+
| [<span>Repository#</span>continueRebase <span>(signature, beforeNextFn)</span>](/api/repository/#continueRebase) | <span class="tags"><span class="async">Async</span></span> |
14061406
| [<span>Repository#</span>createBlobFromBuffer <span>(buffer)</span>](/api/repository/#createBlobFromBuffer) | <span class="tags"><span class="sync">Sync</span></span> |
14071407
| [<span>Repository#</span>createBranch <span>(name, commit, force, signature, logMessage)</span>](/api/repository/#createBranch) | <span class="tags"><span class="async">Async</span></span> |
14081408
| [<span>Repository#</span>createCommit <span>(updateRef, author, committer, message, Tree, parents)</span>](/api/repository/#createCommit) | <span class="tags"><span class="async">Async</span></span> |
@@ -1413,8 +1413,8 @@ sections:
14131413
| [<span>Repository#</span>defaultSignature <span>()</span>](/api/repository/#defaultSignature) | <span class="tags"><span class="sync">Sync</span></span> |
14141414
| [<span>Repository#</span>deleteTagByName <span>(Short)</span>](/api/repository/#deleteTagByName) | <span class="tags"><span class="async">Async</span></span> |
14151415
| [<span>Repository#</span>detachHead <span>()</span>](/api/repository/#detachHead) | <span class="tags"><span class="sync">Sync</span></span> |
1416-
| [<span>Repository#</span>fetch <span>(remote, fetchOptions)</span>](/api/repository/#fetch) | <span class="tags"><span class="sync">Sync</span></span> |
1417-
| [<span>Repository#</span>fetchAll <span>(fetchOptions, callback)</span>](/api/repository/#fetchAll) | <span class="tags"><span class="sync">Sync</span></span> |
1416+
| [<span>Repository#</span>fetch <span>(remote, fetchOptions)</span>](/api/repository/#fetch) | <span class="tags"><span class="async">Async</span></span> |
1417+
| [<span>Repository#</span>fetchAll <span>(fetchOptions, callback)</span>](/api/repository/#fetchAll) | <span class="tags"><span class="async">Async</span></span> |
14181418
| [<span>Repository#</span>fetchheadForeach <span>(callback)</span>](/api/repository/#fetchheadForeach) | <span class="tags"><span class="async">Async</span></span> |
14191419
| [<span>Repository#</span>free <span>()</span>](/api/repository/#free) | <span class="tags"><span class="sync">Sync</span></span> |
14201420
| [<span>Repository#</span>getBlob <span>(String)</span>](/api/repository/#getBlob) | <span class="tags"><span class="async">Async</span></span> |
@@ -1429,8 +1429,8 @@ sections:
14291429
| [<span>Repository#</span>getReferenceCommit <span>(name)</span>](/api/repository/#getReferenceCommit) | <span class="tags"><span class="async">Async</span></span> |
14301430
| [<span>Repository#</span>getReferenceNames <span>(type)</span>](/api/repository/#getReferenceNames) | <span class="tags"><span class="async">Async</span></span> |
14311431
| [<span>Repository#</span>getReferences <span>(type)</span>](/api/repository/#getReferences) | <span class="tags"><span class="async">Async</span></span> |
1432-
| [<span>Repository#</span>getRemote <span>(remote, callback)</span>](/api/repository/#getRemote) | <span class="tags"><span class="sync">Sync</span></span> |
1433-
| [<span>Repository#</span>getRemotes <span>(Optional)</span>](/api/repository/#getRemotes) | <span class="tags"><span class="sync">Sync</span></span> |
1432+
| [<span>Repository#</span>getRemote <span>(remote, callback)</span>](/api/repository/#getRemote) | <span class="tags"><span class="async">Async</span></span> |
1433+
| [<span>Repository#</span>getRemotes <span>(Optional)</span>](/api/repository/#getRemotes) | <span class="tags"><span class="async">Async</span></span> |
14341434
| [<span>Repository#</span>getStatus <span>(opts)</span>](/api/repository/#getStatus) | <span class="tags"><span class="async">Async</span></span> |
14351435
| [<span>Repository#</span>getStatusExt <span>(opts)</span>](/api/repository/#getStatusExt) | <span class="tags"><span class="async">Async</span></span> |
14361436
| [<span>Repository#</span>getSubmoduleNames <span>()</span>](/api/repository/#getSubmoduleNames) | <span class="tags"><span class="async">Async</span></span> |
@@ -1451,11 +1451,11 @@ sections:
14511451
| [<span>Repository#</span>isRebasing <span>()</span>](/api/repository/#isRebasing) | <span class="tags"><span class="sync">Sync</span></span> |
14521452
| [<span>Repository#</span>isReverting <span>()</span>](/api/repository/#isReverting) | <span class="tags"><span class="sync">Sync</span></span> |
14531453
| [<span>Repository#</span>isShallow <span>()</span>](/api/repository/#isShallow) | <span class="tags"><span class="sync">Sync</span></span> |
1454-
| [<span>Repository#</span>mergeBranches <span>(to, from, signature, mergePreference, mergeOptions)</span>](/api/repository/#mergeBranches) | <span class="tags"><span class="sync">Sync</span></span> |
1454+
| [<span>Repository#</span>mergeBranches <span>(to, from, signature, mergePreference, mergeOptions)</span>](/api/repository/#mergeBranches) | <span class="tags"><span class="async">Async</span></span> |
14551455
| [<span>Repository#</span>messageRemove <span>()</span>](/api/repository/#messageRemove) | <span class="tags"><span class="sync">Sync</span></span> |
14561456
| [<span>Repository#</span>odb <span>()</span>](/api/repository/#odb) | <span class="tags"><span class="async">Async</span></span> |
14571457
| [<span>Repository#</span>path <span>()</span>](/api/repository/#path) | <span class="tags"><span class="sync">Sync</span></span> |
1458-
| [<span>Repository#</span>rebaseBranches <span>(branch, upstream, onto, signature, beforeNextFn)</span>](/api/repository/#rebaseBranches) | <span class="tags"><span class="sync">Sync</span></span> |
1458+
| [<span>Repository#</span>rebaseBranches <span>(branch, upstream, onto, signature, beforeNextFn)</span>](/api/repository/#rebaseBranches) | <span class="tags"><span class="async">Async</span></span> |
14591459
| [<span>Repository#</span>refdb <span>()</span>](/api/repository/#refdb) | <span class="tags"><span class="async">Async</span></span> |
14601460
| [<span>Repository#</span>setHead <span>(refname)</span>](/api/repository/#setHead) | <span class="tags"><span class="async">Async</span></span> |
14611461
| [<span>Repository#</span>setHeadDetached <span>(commitish)</span>](/api/repository/#setHeadDetached) | <span class="tags"><span class="sync">Sync</span></span> |

api/repository/index.md

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -249,10 +249,12 @@ repository.configSnapshot().then(function(config) {
249249
| --- | --- |
250250
| [Config](/api/config/) | |
251251
252-
## <a name="continueRebase"></a><span>Repository#</span>continueRebase <span class="tags"><span class="sync">Sync</span></span>
252+
## <a name="continueRebase"></a><span>Repository#</span>continueRebase <span class="tags"><span class="async">Async</span></span>
253253
254254
```js
255-
var oid = repository.continueRebase(signature, beforeNextFn);
255+
repository.continueRebase(signature, beforeNextFn).then(function(oid) {
256+
// Use oid
257+
});
256258
```
257259
258260
Continues an existing rebase
@@ -440,10 +442,11 @@ var result = repository.detachHead();
440442
| Number | 0 on success, GIT_EUNBORNBRANCH when HEAD points to a non existing
441443
branch or an error code |
442444
443-
## <a name="fetch"></a><span>Repository#</span>fetch <span class="tags"><span class="sync">Sync</span></span>
445+
## <a name="fetch"></a><span>Repository#</span>fetch <span class="tags"><span class="async">Async</span></span>
444446
445447
```js
446-
repository.fetch(remote, fetchOptions);
448+
repository.fetch(remote, fetchOptions).then(function() {
449+
// method complete});
447450
```
448451
449452
Fetches from a remote
@@ -453,10 +456,11 @@ Fetches from a remote
453456
| remote | String, [Remote](/api/remote/) | |
454457
| fetchOptions | [Object](/api/object/), [FetchOptions](/api/fetch_options/) | Options for the fetch, includes callbacks for fetching |
455458
456-
## <a name="fetchAll"></a><span>Repository#</span>fetchAll <span class="tags"><span class="sync">Sync</span></span>
459+
## <a name="fetchAll"></a><span>Repository#</span>fetchAll <span class="tags"><span class="async">Async</span></span>
457460
458461
```js
459-
repository.fetchAll(fetchOptions, callback);
462+
repository.fetchAll(fetchOptions, callback).then(function() {
463+
// method complete});
460464
```
461465
462466
Fetches from all remotes. This is done in series due to deadlocking issues
@@ -681,10 +685,12 @@ Lookup references for a repository.
681685
| --- | --- |
682686
| Array&lt;[Reference](/api/reference/)&gt; | |
683687
684-
## <a name="getRemote"></a><span>Repository#</span>getRemote <span class="tags"><span class="sync">Sync</span></span>
688+
## <a name="getRemote"></a><span>Repository#</span>getRemote <span class="tags"><span class="async">Async</span></span>
685689
686690
```js
687-
var remote = repository.getRemote(remote, callback);
691+
repository.getRemote(remote, callback).then(function(remote) {
692+
// Use remote
693+
});
688694
```
689695
690696
Gets a remote from the repo
@@ -698,10 +704,12 @@ Gets a remote from the repo
698704
| --- | --- |
699705
| [Remote](/api/remote/) | The remote object |
700706
701-
## <a name="getRemotes"></a><span>Repository#</span>getRemotes <span class="tags"><span class="sync">Sync</span></span>
707+
## <a name="getRemotes"></a><span>Repository#</span>getRemotes <span class="tags"><span class="async">Async</span></span>
702708
703709
```js
704-
var object = repository.getRemotes(Optional);
710+
repository.getRemotes(Optional).then(function(object) {
711+
// Use object
712+
});
705713
```
706714
707715
Lists out the remotes in the given repository.
@@ -982,10 +990,12 @@ var result = repository.isShallow();
982990
| --- | --- |
983991
| Number | 1 if shallow, zero if not |
984992
985-
## <a name="mergeBranches"></a><span>Repository#</span>mergeBranches <span class="tags"><span class="sync">Sync</span></span>
993+
## <a name="mergeBranches"></a><span>Repository#</span>mergeBranches <span class="tags"><span class="async">Async</span></span>
986994
987995
```js
988-
var oid = repository.mergeBranches(to, from, signature, mergePreference, mergeOptions);
996+
repository.mergeBranches(to, from, signature, mergePreference, mergeOptions).then(function(oid) {
997+
// Use oid
998+
});
989999
```
9901000
9911001
Merge a branch onto another branch
@@ -1034,10 +1044,12 @@ var string = repository.path();
10341044
| --- | --- |
10351045
| String | the path to the repository |
10361046
1037-
## <a name="rebaseBranches"></a><span>Repository#</span>rebaseBranches <span class="tags"><span class="sync">Sync</span></span>
1047+
## <a name="rebaseBranches"></a><span>Repository#</span>rebaseBranches <span class="tags"><span class="async">Async</span></span>
10381048
10391049
```js
1040-
var oid = repository.rebaseBranches(branch, upstream, onto, signature, beforeNextFn);
1050+
repository.rebaseBranches(branch, upstream, onto, signature, beforeNextFn).then(function(oid) {
1051+
// Use oid
1052+
});
10411053
```
10421054
10431055
Rebases a branch onto another branch

0 commit comments

Comments
 (0)