summaryrefslogtreecommitdiff
path: root/builtin-diff.c
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder@ira.uka.de>2008-03-25 22:06:26 +0100
committerJunio C Hamano <gitster@pobox.com>2008-03-26 15:41:35 -0700
commitaf05d67939f306a68c5f81ed30f65a82ae025661 (patch)
tree604f2ab856a425e84f67a5a65c7ee58f74e1d4c8 /builtin-diff.c
parent660b9c3a4e24ce9a2628f2ec88902e2384d1aade (diff)
downloadgit-af05d67939f306a68c5f81ed30f65a82ae025661.tar.gz
Always set *nongit_ok in setup_git_directory_gently()
setup_git_directory_gently() only modified the value of its *nongit_ok argument if we were not in a git repository. Now it will always set it to 0 when we are inside a repository. Also remove now unnecessary initializations in the callers of this function. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-diff.c')
-rw-r--r--builtin-diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-diff.c b/builtin-diff.c
index 444ff2fd92..7c2a8412fa 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -210,7 +210,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
int ents = 0, blobs = 0, paths = 0;
const char *path = NULL;
struct blobinfo blob[2];
- int nongit = 0;
+ int nongit;
int result = 0;
/*