git-watchtower 1.14.6 → 1.14.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/git/branch.js +3 -3
package/package.json
CHANGED
package/src/git/branch.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Provides branch management and parsing
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
|
-
const { execGit,
|
|
6
|
+
const { execGit, fetch, hasUncommittedChanges, getCommitsByDay, log, deleteLocalBranch } = require('./commands');
|
|
7
7
|
const { GitError, ValidationError } = require('../utils/errors');
|
|
8
8
|
|
|
9
9
|
// Valid git branch name pattern (conservative)
|
|
@@ -102,7 +102,7 @@ async function getAllBranches(options = {}) {
|
|
|
102
102
|
// Get local branches
|
|
103
103
|
// Use \x1f (Unit Separator) as delimiter since | can appear in commit subjects
|
|
104
104
|
const delimiter = '\x1f';
|
|
105
|
-
const localResult = await
|
|
105
|
+
const localResult = await execGit(
|
|
106
106
|
['for-each-ref', '--sort=-committerdate', `--format=%(refname:short)${delimiter}%(committerdate:iso8601)${delimiter}%(objectname:short)${delimiter}%(subject)`, 'refs/heads/'],
|
|
107
107
|
{ cwd }
|
|
108
108
|
);
|
|
@@ -127,7 +127,7 @@ async function getAllBranches(options = {}) {
|
|
|
127
127
|
}
|
|
128
128
|
|
|
129
129
|
// Get remote branches
|
|
130
|
-
const remoteResult = await
|
|
130
|
+
const remoteResult = await execGit(
|
|
131
131
|
['for-each-ref', '--sort=-committerdate', `--format=%(refname:short)${delimiter}%(committerdate:iso8601)${delimiter}%(objectname:short)${delimiter}%(subject)`, `refs/remotes/${remoteName}/`],
|
|
132
132
|
{ cwd }
|
|
133
133
|
);
|