Merged
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #930 +/- ##
==========================================
+ Coverage 42.91% 43.14% +0.23%
==========================================
Files 21 21
Lines 1713 1718 +5
==========================================
+ Hits 735 741 +6
+ Misses 978 977 -1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
orhun
reviewed
Oct 24, 2024
Owner
orhun
left a comment
orhun
left a comment
There was a problem hiding this comment.
This is a good starting point, thanks :)
orhun
reviewed
Oct 29, 2024
orhun
reviewed
Oct 29, 2024
If the .git directory can't be opened (usually because the `.git` directory is missing) it attempts to find the git repository in the location used by Jujutsu (i.e. `.jj/repo/store/git`). If the Jujutsu git directory doesn't exist, then the origin error is propogated. CODE test: add unit tests for opening jujutsu repo Update git-cliff-core/src/repo.rs Co-authored-by: Orhun Parmaksız <[email protected]> Update git-cliff-core/src/repo.rs Co-authored-by: Orhun Parmaksız <[email protected]> Update git-cliff-core/src/repo.rs Co-authored-by: Orhun Parmaksız <[email protected]> Update git-cliff-core/src/repo.rs Co-authored-by: Orhun Parmaksız <[email protected]>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Description
Adds support for opening the Git repository used when a repository is cloned using Jujutsu and the
--colocateoption was NOT used.Note: this requires that the user updates the
HEADof the git repository to point to their mainline branch, as the Git repository the Jujutsu creates isn't 100% configured.If the .git directory can't be opened (usually because the
.gitdirectory is missing) it attempts to find the git repository in the location used by Jujutsu (i.e..jj/repo/store/git). If the Jujutsu git directory doesn't exist, then the origin error is propogated.Motivation and Context
Jujutsu is a Version Control System that uses Git as it's local store, and can work as an effective replacement for Git on a Developer's workstation.
When a Git repository is cloned by Jujutsu, the default location for the Git respository files is
.jj/repo/store/git, rather than the usual.git.git-cliffexpectes the.gitlocation. This PR teachesgit-cliffto also check the.jj/repo/store/gitlocation.Closes #875
How Has This Been Tested?
Test with Jujutsu repository:
jj git clone [email protected]:kemitix/git-next.git && cd git-nextmainbranch:echo 'ref: refs/remotes/origin/maingit-cliff:../git-cliff/target/debug/git-cliffRegression test with a Git repository:
git clone [email protected]:kemitix/git-next.git git-next-git && cd git-next-gitgit-cliff:../git-cliff/target/debug/git-cliffScreenshots / Logs (if applicable)
Types of Changes
Checklist: