diff options
Diffstat (limited to 'src/status.c')
| -rw-r--r-- | src/status.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/status.c b/src/status.c index 7da94edc1..ccb8d37da 100644 --- a/src/status.c +++ b/src/status.c @@ -257,9 +257,8 @@ int git_status_list_new( opts ? opts->show : GIT_STATUS_SHOW_INDEX_AND_WORKDIR; int error = 0; unsigned int flags = opts ? opts->flags : GIT_STATUS_OPT_DEFAULTS; - git_diff_list *head2idx = NULL; - assert(show <= GIT_STATUS_SHOW_INDEX_THEN_WORKDIR); + assert(show <= GIT_STATUS_SHOW_WORKDIR_ONLY); *out = NULL; @@ -308,10 +307,8 @@ int git_status_list_new( &status->head2idx, repo, head, NULL, &diffopt)) < 0) goto done; - head2idx = status->head2idx; - if ((flags & GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX) != 0 && - (error = git_diff_find_similar(head2idx, NULL)) < 0) + (error = git_diff_find_similar(status->head2idx, NULL)) < 0) goto done; } @@ -325,16 +322,8 @@ int git_status_list_new( goto done; } - if (show == GIT_STATUS_SHOW_INDEX_THEN_WORKDIR) { - if ((error = git_diff__paired_foreach( - head2idx, NULL, status_collect, status)) < 0) - goto done; - - head2idx = NULL; - } - if ((error = git_diff__paired_foreach( - head2idx, status->idx2wd, status_collect, status)) < 0) + status->head2idx, status->idx2wd, status_collect, status)) < 0) goto done; if (flags & GIT_STATUS_OPT_SORT_CASE_SENSITIVELY) |