summaryrefslogtreecommitdiff
path: root/src/checkout.c
diff options
context:
space:
mode:
authornulltoken <emeric.fermas@gmail.com>2013-01-12 19:27:31 +0100
committernulltoken <emeric.fermas@gmail.com>2013-01-13 10:25:54 +0100
commit2a3b3e0324b272c50c8d2d7767bd4d55c4d453f6 (patch)
tree3051f2ff2113854350b906462b2017bd46c7a8af /src/checkout.c
parent09e29e47b3ee18888cfb0fc4abd5346b390e70fb (diff)
downloadlibgit2-2a3b3e0324b272c50c8d2d7767bd4d55c4d453f6.tar.gz
checkout: Teach checkout to cope with orphaned Head
Fix #1236
Diffstat (limited to 'src/checkout.c')
-rw-r--r--src/checkout.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/checkout.c b/src/checkout.c
index b58ef9f44..d5a471d0c 100644
--- a/src/checkout.c
+++ b/src/checkout.c
@@ -1173,7 +1173,14 @@ static int checkout_data_init(
if (!data->opts.baseline) {
data->opts_free_baseline = true;
- if ((error = checkout_lookup_head_tree(&data->opts.baseline, repo)) < 0)
+ error = checkout_lookup_head_tree(&data->opts.baseline, repo);
+
+ if (error == GIT_EORPHANEDHEAD) {
+ error = 0;
+ giterr_clear();
+ }
+
+ if (error < 0)
goto cleanup;
}