aboutsummaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorMatthias Lederhofer <matled@gmx.net>2007-06-03 16:48:16 +0200
committerJunio C Hamano <gitster@pobox.com>2007-06-06 16:07:53 -0700
commit7ae3df8c0aa3b7337ae9ac7b6184ac05985bf996 (patch)
tree7a0a38202a5dec2f1e509f624eb86b5979f63e84 /setup.c
parent892c41b98ae2e6baf3aa13901cb10db9ac67d2f3 (diff)
downloadgit-7ae3df8c0aa3b7337ae9ac7b6184ac05985bf996.tar.gz
git-7ae3df8c0aa3b7337ae9ac7b6184ac05985bf996.tar.xz
Use new semantics of is_bare/inside_git_dir/inside_work_tree
Up to now to check for a working tree this was used: !is_bare && !inside_git_dir (the check for bare is redundant because is_inside_git_dir returned already 1 for bare repositories). Now the check is: inside_work_tree && !inside_git_dir Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'setup.c')
-rw-r--r--setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.c b/setup.c
index 7e32de229..14a4d955b 100644
--- a/setup.c
+++ b/setup.c
@@ -95,7 +95,7 @@ void verify_non_filename(const char *prefix, const char *arg)
const char *name;
struct stat st;
- if (is_inside_git_dir())
+ if (!is_inside_work_tree() || is_inside_git_dir())
return;
if (*arg == '-')
return; /* flag */