proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-21 20:34:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

stash: drop unused variable

Browse Source
This commit is contained in:
Edward Thomson 2015-06-29 15:17:58 -05:00
parent ded4ccab01
commit 149d5d8a50
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/stash.c
View File

@ -793,7 +793,6 @@ static int stage_new_file(const git_index_entry **entries, void *data)
static int stage_new_files( static int stage_new_files(
git_index **out, git_index **out,
git_repository *repo,
git_tree *parent_tree, git_tree *parent_tree,
git_tree *tree) git_tree *tree)
{ {
@ -886,7 +885,7 @@ int git_stash_apply(
*/ */
} else if ((opts.flags & GIT_STASH_APPLY_REINSTATE_INDEX) == 0) { } else if ((opts.flags & GIT_STASH_APPLY_REINSTATE_INDEX) == 0) {
if ((error = stage_new_files( if ((error = stage_new_files(
&stash_adds, repo, stash_parent_tree, stash_tree)) < 0 || &stash_adds, stash_parent_tree, stash_tree)) < 0 ||
(error = merge_indexes( (error = merge_indexes(
&unstashed_index, repo, stash_parent_tree, repo_index, stash_adds)) < 0) &unstashed_index, repo, stash_parent_tree, repo_index, stash_adds)) < 0)
goto cleanup; goto cleanup;