diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/checkout.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/checkout.c b/src/checkout.c index b3e95dff8..f39c341d4 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -2430,8 +2430,13 @@ static int checkout_data_init( if (!data->opts.baseline && !data->opts.baseline_index) { data->opts_free_baseline = true; + error = 0; - error = checkout_lookup_head_tree(&data->opts.baseline, repo); + /* if we don't have an index, this is an initial checkout and + * should be against an empty baseline + */ + if (data->index->on_disk) + error = checkout_lookup_head_tree(&data->opts.baseline, repo); if (error == GIT_EUNBORNBRANCH) { error = 0; |