kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

builtin/config.c: rename check_blob_write() -> check_write() 

The function will be reused to check for other conditions which prevent
write.

Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Kirill A. Shutemov 11 years ago committed by Junio C Hamano
parent
d14d42440d
commit
6aea9f0fdd
1 changed files with 9 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      builtin/config.c

18
builtin/config.c
Unescape View File

@ -362,7 +362,7 @@ static int get_colorbool(int print)
return get_colorbool_found ? 0 : 1; return get_colorbool_found ? 0 : 1;
} }


static void check_blob_write(void) static void check_write(void)
{ {
if (given_config_blob) if (given_config_blob)
die("writing config blobs is not supported"); die("writing config blobs is not supported");
@ -572,7 +572,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
} }
else if (actions == ACTION_SET) { else if (actions == ACTION_SET) {
int ret; int ret;
check_blob_write(); check_write();
check_argc(argc, 2, 2); check_argc(argc, 2, 2);
value = normalize_value(argv[0], argv[1]); value = normalize_value(argv[0], argv[1]);
ret = git_config_set_in_file(given_config_file, argv[0], value); ret = git_config_set_in_file(given_config_file, argv[0], value);
@ -582,21 +582,21 @@ int cmd_config(int argc, const char **argv, const char *prefix)
return ret; return ret;
} }
else if (actions == ACTION_SET_ALL) { else if (actions == ACTION_SET_ALL) {
check_blob_write(); check_write();
check_argc(argc, 2, 3); check_argc(argc, 2, 3);
value = normalize_value(argv[0], argv[1]); value = normalize_value(argv[0], argv[1]);
return git_config_set_multivar_in_file(given_config_file, return git_config_set_multivar_in_file(given_config_file,
argv[0], value, argv[2], 0); argv[0], value, argv[2], 0);
} }
else if (actions == ACTION_ADD) { else if (actions == ACTION_ADD) {
check_blob_write(); check_write();
check_argc(argc, 2, 2); check_argc(argc, 2, 2);
value = normalize_value(argv[0], argv[1]); value = normalize_value(argv[0], argv[1]);
return git_config_set_multivar_in_file(given_config_file, return git_config_set_multivar_in_file(given_config_file,
argv[0], value, "^$", 0); argv[0], value, "^$", 0);
} }
else if (actions == ACTION_REPLACE_ALL) { else if (actions == ACTION_REPLACE_ALL) {
check_blob_write(); check_write();
check_argc(argc, 2, 3); check_argc(argc, 2, 3);
value = normalize_value(argv[0], argv[1]); value = normalize_value(argv[0], argv[1]);
return git_config_set_multivar_in_file(given_config_file, return git_config_set_multivar_in_file(given_config_file,
@ -623,7 +623,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
return get_urlmatch(argv[0], argv[1]); return get_urlmatch(argv[0], argv[1]);
} }
else if (actions == ACTION_UNSET) { else if (actions == ACTION_UNSET) {
check_blob_write(); check_write();
check_argc(argc, 1, 2); check_argc(argc, 1, 2);
if (argc == 2) if (argc == 2)
return git_config_set_multivar_in_file(given_config_file, return git_config_set_multivar_in_file(given_config_file,
@ -633,14 +633,14 @@ int cmd_config(int argc, const char **argv, const char *prefix)
argv[0], NULL); argv[0], NULL);
} }
else if (actions == ACTION_UNSET_ALL) { else if (actions == ACTION_UNSET_ALL) {
check_blob_write(); check_write();
check_argc(argc, 1, 2); check_argc(argc, 1, 2);
return git_config_set_multivar_in_file(given_config_file, return git_config_set_multivar_in_file(given_config_file,
argv[0], NULL, argv[1], 1); argv[0], NULL, argv[1], 1);
} }
else if (actions == ACTION_RENAME_SECTION) { else if (actions == ACTION_RENAME_SECTION) {
int ret; int ret;
check_blob_write(); check_write();
check_argc(argc, 2, 2); check_argc(argc, 2, 2);
ret = git_config_rename_section_in_file(given_config_file, ret = git_config_rename_section_in_file(given_config_file,
argv[0], argv[1]); argv[0], argv[1]);
@ -651,7 +651,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
} }
else if (actions == ACTION_REMOVE_SECTION) { else if (actions == ACTION_REMOVE_SECTION) {
int ret; int ret;
check_blob_write(); check_write();
check_argc(argc, 1, 1); check_argc(argc, 1, 1);
ret = git_config_rename_section_in_file(given_config_file, ret = git_config_rename_section_in_file(given_config_file,
argv[0], NULL); argv[0], NULL);

Write Preview
Loading…
Cancel
Save