Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
checkout: reorder check_filename conditional
[gitweb.git]
/
builtin
/
checkout.c
diff --git
a/builtin/checkout.c
b/builtin/checkout.c
index 3e141fc1491949a2dbb47c59d7d156ae6fe4eb47..d34f58eba6c1dc0fe0cfd30d0f5a2bed745ad1ff 100644
(file)
--- a/
builtin/checkout.c
+++ b/
builtin/checkout.c
@@
-965,7
+965,7
@@
static int parse_branchname_arg(int argc, const char **argv,
*/
int recover_with_dwim = dwim_new_local_branch_ok;
- if (
check_filename(NULL, arg) && !has_dash_dash
)
+ if (
!has_dash_dash && check_filename(NULL, arg)
)
recover_with_dwim = 0;
/*
* Accept "git checkout foo" and "git checkout foo --"