stash: partial stash specific files #6330
Merged
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
f80118c to
4271c98
Compare
4271c98 to
d91de9b
Compare
|
@ethomson Quick question: the Git CLI introduced a new paradigm for stashing a while back via the |
|
this would be so nice to have! thanks @gitkraken-jacobw for providing this! |
|
Sorry about the long delay here - I'm trying to get through some of the backlog of pull requests. In general, this is great. Following up on your question:
I'm not super familiar with the new stash push. What are the other differences are there between Concretely, should |
|
I Hope it’s just a naming thing. Being able to support partial stashing would be huuuge for all apps being based on libgit2 😍 |
ethomson
previously approved these changes
Feb 16, 2023
include/git2/stash.h
Outdated
| const char *message; | ||
|
|
||
| /** Flags to control the stashing process. (see GIT_STASH_* above) */ | ||
| uint32_t flags; |
There was a problem hiding this comment.
This can pack better on 64 bit architectures if it's moved up with version.
ethomson
reviewed
Feb 16, 2023
src/libgit2/stash.c
Outdated
| const git_strarray *paths) | ||
| { | ||
| unsigned int status_flags; | ||
| size_t i, error = 0; |
ethomson
reviewed
Feb 16, 2023
src/libgit2/stash.c
Outdated
|
|
||
| opts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR; | ||
| opts.flags = GIT_STATUS_OPT_EXCLUDE_SUBMODULES | ||
| | GIT_STATUS_OPT_INCLUDE_UNMODIFIED |
There was a problem hiding this comment.
operators should be at the end of the line, not the start of the next line.
ethomson
reviewed
Feb 16, 2023
src/libgit2/stash.c
Outdated
|
|
||
| if (has_paths) { | ||
| git_reference_free(head); | ||
| git_index_free(index); |
There was a problem hiding this comment.
This looks like it's being loaded regardless of has_paths
|
I made some minor comments as I did the review just to document what was in my mind. Again - this is a great PR. Thanks again. |
netbsd-srcmastr
pushed a commit
to NetBSD/pkgsrc
that referenced
this pull request
Feb 25, 2023
v1.6 ---- This is release v1.6.0, "Hubbeliges Krokodil". This release adds experimental SHA256 support and includes many new features and bugfixes. ## What's Changed ### New features * **Support for bare repositories with SHA256 support (experimental)** by @ethomson in libgit2/libgit2#6191 You can configure experimental SHA256 support in libgit2 with `cmake -DEXPERIMENTAL_SHA256=ON` during project setup. This is useful for considering future integrations, work on clients, and work on language bindings. At present, working with bare repositories should largely work, including remote operations. But many pieces of functionality - including working with the index - are not yet supported. As a result, **libgit2 with SHA256 support should not be used in production or released with package distribution.** * **Support the notion of a home directory separately from global configuration directory** by @ethomson in libgit2/libgit2#6455 and libgit2/libgit2#6456 Callers and language bindings can now configure the home directory that libgit2 uses for file lookups (eg, the `.ssh` directory). This configuration is separate from the git global configuration path. * **stash: partial stash specific files** by @gitkraken-jacobw in libgit2/libgit2#6330 A stash can be created with only specific files, using a pathspec. This is similar to the `git stash push` command. * **push: revparse refspec source, so you can push things that are not refs** by @sven-of-cord in libgit2/libgit2#6362 Pushes can be performed using refspecs instead of only references. * **Support OpenSSL3** by @ethomson in libgit2/libgit2#6464 and libgit2/libgit2#6471 OpenSSL 3 is now supported, both when compiled directly and dynamically loaded. ### Bug fixes * winhttp: support long custom headers by @kcsaul in libgit2/libgit2#6363 * Fix memory leak by @csware in libgit2/libgit2#6382 * Don't fail the whole clone if you can't find a default branch by @torvalds in libgit2/libgit2#6369 * #6366: When a worktree is missing, return `GIT_ENOTFOUND`. by @arroz in libgit2/libgit2#6395 * commit-graph: only verify csum on `git_commit_graph_open()`. by @derrickstolee in libgit2/libgit2#6420 * Ignore missing 'safe.directory' config during ownership checks by @kcsaul in libgit2/libgit2#6408 * Fix leak in `git_tag_create_from_buffer` by @julianmesa-gitkraken in libgit2/libgit2#6421 * http: Update httpclient options when reusing an existing connection. by @slackner in libgit2/libgit2#6416 * Add support for `safe.directory *` by @csware in libgit2/libgit2#6429 * URL parsing for google-compatible URLs by @ethomson in libgit2/libgit2#6326 * Fixes #6433: `git_submodule_update` fails to update configured but missing submodule by @tagesuhu in libgit2/libgit2#6434 * transport: fix capabilities calculation by @russell in libgit2/libgit2#6435 * push: use resolved oid as the source by @ethomson in libgit2/libgit2#6452 * Use `git_clone__submodule` to avoid file checks in workdir by @abizjak in libgit2/libgit2#6444 * #6422: handle dangling symbolic refs gracefully by @arroz in libgit2/libgit2#6423 * `diff_file`: Fix crash when freeing a patch representing an empty untracked file by @jorio in libgit2/libgit2#6475 * clone: clean up options on failure by @ethomson in libgit2/libgit2#6479 * stash: update strarray usage by @ethomson in libgit2/libgit2#6487 * #6491: Sets `oid_type` on repos open with `git_repository_open_bare` by @arroz in libgit2/libgit2#6492 * Handle Win32 shares by @ethomson in libgit2/libgit2#6493 * Make failure to connect to ssh-agent non-fatal by @fxcoudert in libgit2/libgit2#6497 * odb: don't unconditionally add `oid_type` to stream by @ethomson in libgit2/libgit2#6499 * Pass hostkey & port to host verify callback by @fxcoudert in libgit2/libgit2#6503 ### Security fixes ### Code cleanups * meta: update version number to v1.6.0-alpha by @ethomson in libgit2/libgit2#6352 * sha256: indirection for experimental functions by @ethomson in libgit2/libgit2#6354 * Delete `create.c.bak` by @lrm29 in libgit2/libgit2#6398 * Support non-cmake builds with an in-tree `experimental.h` by @ethomson in libgit2/libgit2#6405 ### Build and CI improvements * tests: skip flaky-ass googlesource tests by @ethomson in libgit2/libgit2#6353 * clar: remove ftrunacte from libgit2 tests by @boretrk in libgit2/libgit2#6357 * CI Improvements by @ethomson in libgit2/libgit2#6403 * fix compile on Windows with `-DWIN32_LEAN_AND_MEAN` by @christoph-cullmann in libgit2/libgit2#6373 * Fixes #6365 : Uppercase windows.h include fails build in case-sensitive OS by @Vinz2008 in libgit2/libgit2#6377 * ci: update version numbers of actions by @ethomson in libgit2/libgit2#6448 * thread: avoid warnings when building without threads by @ethomson in libgit2/libgit2#6432 * src: hide unused hmac() prototype by @0-wiz-0 in libgit2/libgit2#6458 * tests: update clar test runner by @ethomson in libgit2/libgit2#6459 * ci: always create test summaries, even on failure by @ethomson in libgit2/libgit2#6460 * Fix build failure with `-DEMBED_SSH_PATH` by @vicr123 in libgit2/libgit2#6374 * Define correct `off64_t` for AIX by @bzEq in libgit2/libgit2#6376 * Fix some warnings in main by @ethomson in libgit2/libgit2#6480 * strarray: remove deprecated declaration by @ethomson in libgit2/libgit2#6486 * tests: always unset `HTTP_PROXY` before starting tests by @ethomson in libgit2/libgit2#6498 ### Documentation improvements * add 2-clause BSD license to COPYING by @martinvonz in libgit2/libgit2#6413 * Add new PHP bindings project to language bindings section of README.md by @RogerGee in libgit2/libgit2#6473 * README: clarify the linking exception by @ethomson in libgit2/libgit2#6494 * Correct the definition of "empty" in the docs for `git_repository_is_empty` by @timrogers in libgit2/libgit2#6500
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.
There's this concept called partial stashing in Git where users are able to stash desired files without having to stash and also reset the entire workdir. I based my implementation on tiennou's suggestion from #4725. This introduces options to
git_stash_savewhere developers are able to supply the paths that they want to have stashed from the workdir. I could have gone further and have exposed agit_index*option as tiennou suggested, but I chose not to at this moment. Let me know if I should expose agit_index*option so that users can supply an arbitrary index to be stashed.I also introduced
GIT_STASH_KEEP_ALL, which prevents resetting the index and workdir once a stash has been completed.