Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
worktree: simplify prefixing paths
[gitweb.git]
/
builtin
/
checkout.c
diff --git
a/builtin/checkout.c
b/builtin/checkout.c
index efcbd8f6b5e0b7d551c88c02b6d7d3069a47944d..60417187838ef2e93fcf997dd4b311bcf54c0a15 100644
(file)
--- a/
builtin/checkout.c
+++ b/
builtin/checkout.c
@@
-1111,7
+1111,7
@@
static int checkout_branch(struct checkout_opts *opts,
char *head_ref = resolve_refdup("HEAD", 0, sha1, &flag);
if (head_ref &&
(!(flag & REF_ISSYMREF) || strcmp(head_ref, new->path)))
- die_if_checked_out(new->path);
+ die_if_checked_out(new->path
, 1
);
free(head_ref);
}