bug(cli): add support for repos that are submodules #1795
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## main #1795 +/- ##
==========================================
- Coverage 94.79% 94.17% -0.62%
==========================================
Files 35 35
Lines 1748 1768 +20
==========================================
+ Hits 1657 1665 +8
- Misses 91 103 +12
Continue to review full report at Codecov.
|
tripodsan
reviewed
Jun 30, 2021
src/git-utils.js
Outdated
| @@ -30,14 +31,17 @@ class GitUtils { | |||
| * | |||
| * @param {string} dir working tree directory path of the git repo | |||
| * @param {string} [homedir] optional users home directory | |||
| * @param {string} [gitdir] the git directory path | |||
There was a problem hiding this comment.
Suggested change
| * @param {string} [gitdir] the git directory path | |
| * @param {string} [gitdir] optional git directory path |
tripodsan
reviewed
Jun 30, 2021
src/git-utils.js
Outdated
| @@ -105,9 +109,10 @@ class GitUtils { | |||
| * @param {string} dir working tree directory path of the git repo | |||
| * @param {string} filepath file to check | |||
| * @param {string} [homedir] optional users home directory | |||
| * @param {string} [gitdir] the git directory path | |||
There was a problem hiding this comment.
Suggested change
| * @param {string} [gitdir] the git directory path | |
| * @param {string} [gitdir] optional git directory path |
tripodsan
reviewed
Jun 30, 2021
src/git-utils.js
Outdated
| @@ -140,25 +145,35 @@ class GitUtils { | |||
| * will be returned instead. | |||
| * | |||
| * @param {string} dir working tree directory path of the git repo | |||
| * @param {string} [gitdir] the git directory path | |||
There was a problem hiding this comment.
Suggested change
| * @param {string} [gitdir] the git directory path | |
| * @param {string} [gitdir] optional git directory path |
tripodsan
reviewed
Jun 30, 2021
src/git-utils.js
Outdated
| @@ -174,11 +189,12 @@ class GitUtils { | |||
| * current branch or tag. | |||
| * | |||
| * @param {string} dir working tree directory path of the git repo | |||
| * @param {string} [gitdir] the git directory path | |||
There was a problem hiding this comment.
Suggested change
| * @param {string} [gitdir] the git directory path | |
| * @param {string} [gitdir] optional git directory path |
tripodsan
reviewed
Jun 30, 2021
src/git-utils.js
Outdated
| @@ -188,10 +204,11 @@ class GitUtils { | |||
| * will be returned instead. | |||
| * | |||
| * @param {string} dir working tree directory path of the git repo | |||
| * @param {string} [gitdir] the git directory path | |||
There was a problem hiding this comment.
Suggested change
| * @param {string} [gitdir] the git directory path | |
| * @param {string} [gitdir] optional git directory path |
tripodsan
reviewed
Jun 30, 2021
src/git-utils.js
Outdated
| @@ -200,11 +217,12 @@ class GitUtils { | |||
| * Returns the `origin` remote url or `''` if none is defined. | |||
| * | |||
| * @param {string} dir working tree directory path of the git repo | |||
| * @param {string} [gitdir] the git directory path | |||
There was a problem hiding this comment.
Suggested change
| * @param {string} [gitdir] the git directory path | |
| * @param {string} [gitdir] optional git directory path |
tripodsan
reviewed
Jun 30, 2021
src/git-utils.js
Outdated
| @@ -216,41 +234,50 @@ class GitUtils { | |||
| * Same as #getOrigin() but returns a `GitUrl` instance instead of a string. | |||
| * | |||
| * @param {string} dir working tree directory path of the git repo | |||
| * @param {string} [gitdir] the git directory path | |||
There was a problem hiding this comment.
Suggested change
| * @param {string} [gitdir] the git directory path | |
| * @param {string} [gitdir] optional git directory path |
tripodsan
reviewed
Jun 30, 2021
src/git-utils.js
Outdated
| return origin ? new GitUrl(origin) : null; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the sha of the current (i.e. `HEAD`) commit. | ||
| * | ||
| * @param {string} dir working tree directory path of the git repo | ||
| * @param {string} [gitdir] the git directory path |
There was a problem hiding this comment.
Suggested change
| * @param {string} [gitdir] the git directory path | |
| * @param {string} [gitdir] optional git directory path |
tripodsan
reviewed
Jun 30, 2021
src/git-utils.js
Outdated
| } | ||
|
|
||
| /** | ||
| * Returns the commit oid of the curent commit referenced by `ref` | ||
| * | ||
| * @param {string} dir git repo path | ||
| * @param {string} ref reference (branch, tag or commit sha) | ||
| * @param {string} [gitdir] the git directory path |
There was a problem hiding this comment.
Suggested change
| * @param {string} [gitdir] the git directory path | |
| * @param {string} [gitdir] optional git directory path |
tripodsan
reviewed
Jun 30, 2021
src/git-utils.js
Outdated
| @@ -263,16 +290,74 @@ class GitUtils { | |||
| * @param {string} dir git repo path | |||
| * @param {string} ref reference (branch, tag or commit sha) | |||
| * @param {string} filePath relative path to file | |||
| * @param {string} [gitdir] the git directory path | |||
There was a problem hiding this comment.
Suggested change
| * @param {string} [gitdir] the git directory path | |
| * @param {string} [gitdir] optional git directory path |
tripodsan
reviewed
Jun 30, 2021
src/up.cmd.js
Outdated
| throw Error('hlx up needs local git repository.'); | ||
| if (!this._gitHead) { | ||
| this._gitDir = await GitUtils.getGitDir(this.directory); | ||
| this._gitHead = path.join(this._gitDir, 'HEAD'); |
There was a problem hiding this comment.
why not path.resolve() ?
There was a problem hiding this comment.
no real reason, this.directory is already resolved and getGitDir() returns a resolved path - do you always prefer path.resolve()?
tripodsan
requested changes
Jun 30, 2021
|
Only nitpick from my side: use |
|
@maxakuru why did you close this PR ? |
|
@tripodsan seemed like the consensus on #1794 was that submodule support wasn't wanted so closed this for #1796 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
getGitDir()function to GitUtils to find gitdir of a repo directorygetGitDir()in UpCommandgitdirargument to all GitUtils methods that use isomorphic-git APIs that support gitdir optionTODO
Related Issues
#1794