vendor/libgit2/include/git2/stash.h in rugged-0.28.4 vs vendor/libgit2/include/git2/stash.h in rugged-0.28.4.1
- old
+ new
@@ -118,18 +118,18 @@
/**
* Stash application options structure
*
* Initialize with `GIT_STASH_APPLY_OPTIONS_INIT`. Alternatively, you can
- * use `git_stash_apply_options_init`.
+ * use `git_stash_apply_init_options`.
*
*/
typedef struct git_stash_apply_options {
unsigned int version;
/** See `git_stash_apply_flags_t`, above. */
- uint32_t flags;
+ git_stash_apply_flags flags;
/** Options to use when writing files to the working directory. */
git_checkout_options checkout_options;
/** Optional callback to notify the consumer of application progress. */
@@ -151,10 +151,10 @@
*
* @param opts The `git_stash_apply_options` struct to initialize.
* @param version The struct version; pass `GIT_STASH_APPLY_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
-GIT_EXTERN(int) git_stash_apply_options_init(
+GIT_EXTERN(int) git_stash_apply_init_options(
git_stash_apply_options *opts, unsigned int version);
/**
* Apply a single stashed state from the stash list.
*