diff options
| author | Russell Belfer <rb@github.com> | 2013-11-01 20:51:01 +0400 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-11-01 21:20:51 +0400 |
| commit | 8e5a8ef86f1d528472884f737612083abda86e17 (patch) | |
| tree | 71b090fb4b7c91b8aa54b31fd458e768fec86625 /src/checkout.c | |
| parent | 4bf630b6baf342fa929a8f7e4e6643197b74216f (diff) | |
Convert git_index_read to have a "force" flag
This is a little more intuitive than the turned-around option that
I originally wrote.
Diffstat (limited to 'src/checkout.c')
| -rw-r--r-- | src/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/checkout.c b/src/checkout.c index 94968e378..dce9afdf4 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -1837,7 +1837,7 @@ static int checkout_data_init( } else { /* otherwise, grab and reload the index */ if ((error = git_repository_index(&data->index, data->repo)) < 0 || - (error = git_index_read(data->index, false)) < 0) + (error = git_index_read(data->index, true)) < 0) goto cleanup; /* cannot checkout if unresolved conflicts exist */ |