@matheusbsbs / matheus-bagliano / commits / 6fb75bed5c
Fork 0

Move deny_non_fast_forwards handling completely into receive-pack.

The 'receive.denynonfastforwards' option has nothing to do with the repository format version. Since receive-pack already uses git_config to initialize itself before executing any updates we can use the normal configuration strategy and isolate the receive specific variables away from the core variables. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Shawn Pearce committed Oct 30, 2006 at 17:35 UTC 6fb75bed5c4a6ce099a24e581ea327e9de3ab8b0
4 files changed +16 -4
cache.h
-1
@@ -188,7 +188,6 @@ extern int prefer_symlink_refs;
188 extern int log_all_ref_updates;
189 extern int warn_ambiguous_refs;
190 extern int shared_repository;
191 -extern int deny_non_fast_forwards;
191 extern const char *apply_default_whitespace;
192 extern int zlib_compression_level;
193
environment.c
-1
@@ -20,7 +20,6 @@ int warn_ambiguous_refs = 1;
20 int repository_format_version;
21 char git_commit_encoding[MAX_ENCODING_LENGTH] = "utf-8";
22 int shared_repository = PERM_UMASK;
23 -int deny_non_fast_forwards = 0;
23 const char *apply_default_whitespace;
24 int zlib_compression_level = Z_DEFAULT_COMPRESSION;
25 int pager_in_use;
receive-pack.c
+16
@@ -9,11 +9,25 @@ static const char receive_pack_usage[] = "git-receive-pack <git-dir>";
9
10 static const char *unpacker[] = { "unpack-objects", NULL };
11
12 +static int deny_non_fast_forwards = 0;
13 static int report_status;
14
15 static char capabilities[] = "report-status";
16 static int capabilities_sent;
17
18 +static int receive_pack_config(const char *var, const char *value)
19 +{
20 + git_default_config(var, value);
21 +
22 + if (strcmp(var, "receive.denynonfastforwards") == 0)
23 + {
24 + deny_non_fast_forwards = git_config_bool(var, value);
25 + return 0;
26 + }
27 +
28 + return 0;
29 +}
30 +
31 static int show_ref(const char *path, const unsigned char *sha1)
32 {
33 if (capabilities_sent)
@@ -338,6 +352,8 @@ int main(int argc, char **argv)
352 if(!enter_repo(dir, 0))
353 die("'%s': unable to chdir or not a git archive", dir);
354
355 + git_config(receive_pack_config);
356 +
357 write_head_info();
358
359 /* EOF */
setup.c
-2
@@ -244,8 +244,6 @@ int check_repository_format_version(const char *var, const char *value)
244 repository_format_version = git_config_int(var, value);
245 else if (strcmp(var, "core.sharedrepository") == 0)
246 shared_repository = git_config_perm(var, value);
247 - else if (strcmp(var, "receive.denynonfastforwards") == 0)
248 - deny_non_fast_forwards = git_config_bool(var, value);
247 return 0;
248 }
249