Added (very) basic fish support #284
Closed
Conversation
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
Tree hashes causes a lot of problems. It is very common to have duplicate tree hashes within the repo and that will confuse the algorithm. Instead we now try to go back to the previous approach using the .gitrepo file containing references to the correct ancestry. That combined with using merges will remove a lot of the problems. Documented here: ingydotnet#142
Enable -m and -e for the git subrepo commands. This will allow the user to customize the commit messages and supply some good information. Documented here: ingydotnet#142
Before this commit git-subrepo would set author and committer info to current user, removing the trace of the original author. Now we will keep the author information from the original commit but use current user in the as committer. Documented here: ingydotnet#142
Added a join_method flag, currently set to merge. If you change this flag into rebase you will try the new embryo of rebase functionality. No tests written yet for this, only manually tested. With join_method as merge everything works as usual.
Added concept of `--merge` option for pull. Without `--rebase` or `--merge` a simple fast-forward will be tried. Updated `lib/subrepo` with correct options. Still need to make pull work properly. Ran `make update` to generate all artifact files.
the way we want it to work. Basically push requires pull first, making everything much simpler.
Before this fix, all commits for pulled subrepos would get the same message (created for the first repo) when using the -a/--all option.
Added concept of `--merge` option for pull. Without `--rebase` or `--merge` a simple fast-forward will be tried. Updated `lib/subrepo` with correct options. Still need to make pull work properly. Ran `make update` to generate all artifact files.
|
@ErikBjare thank you for this. We will look at adding it after the upcoming 0.4.0 release work is done. It might even make it into the release. |
ingydotnet
force-pushed
the
release/0.4.0
branch
from
80db61c to
15664e5
Compare
Closed
grimmySwe
force-pushed
the
release/0.4.0
branch
from
15664e5 to
d27107e
Compare
|
:( |
|
Can you target this PR against master? The |
|
@ingydotnet Done |
|
What is the current status on this, and how can I help land this PR? |
|
I'm not interested in this PR anymore, as we went with another approach for managing our git repos. Anyone who feels like it is free to continue the work. |
|
Committed in #446 |
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.
Slight progress on #187.
Doesn't do autocompletion, but the other stuff works.
By the way, thanks @ingydotnet for working on this project!
Hopeful it will be of use for my ActivityWatch project (see this issue: ActivityWatch/activitywatch#70).