projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "git-push: avoid falling back on pushing "matching" refs."
[git.git]
/
repo-config.c
diff --git
a/repo-config.c
b/repo-config.c
index
b2569b7
..
c31e441
100644
(file)
--- a/
repo-config.c
+++ b/
repo-config.c
@@
-6,7
+6,7
@@
static const char git_config_set_usage[] =
static char* key = NULL;
static char* value = NULL;
static char* key = NULL;
static char* value = NULL;
-static regex_t* regex = NULL;
+static regex_t* regex
p
= NULL;
static int do_all = 0;
static int do_not_match = 0;
static int seen = 0;
static int do_all = 0;
static int do_not_match = 0;
static int seen = 0;
@@
-14,9
+14,9
@@
static int seen = 0;
static int show_config(const char* key_, const char* value_)
{
if (!strcmp(key_, key) &&
static int show_config(const char* key_, const char* value_)
{
if (!strcmp(key_, key) &&
- (regex == NULL ||
+ (regex
p
== NULL ||
(do_not_match ^
(do_not_match ^
- !regexec(regex, value_, 0, NULL, 0)))) {
+ !regexec(regex
p
, value_, 0, NULL, 0)))) {
if (do_all) {
printf("%s\n", value_);
return 0;
if (do_all) {
printf("%s\n", value_);
return 0;
@@
-46,8
+46,8
@@
static int get_value(const char* key_, const char* regex_)
regex_++;
}
regex_++;
}
- regex = (regex_t*)malloc(sizeof(regex_t));
- if (regcomp(regex, regex_, REG_EXTENDED)) {
+ regex
p
= (regex_t*)malloc(sizeof(regex_t));
+ if (regcomp(regex
p
, regex_, REG_EXTENDED)) {
fprintf(stderr, "Invalid pattern: %s\n", regex_);
return -1;
}
fprintf(stderr, "Invalid pattern: %s\n", regex_);
return -1;
}
@@
-59,9
+59,9
@@
static int get_value(const char* key_, const char* regex_)
free(value);
}
free(key);
free(value);
}
free(key);
- if (regex) {
- regfree(regex);
- free(regex);
+ if (regex
p
) {
+ regfree(regex
p
);
+ free(regex
p
);
}
if (do_all)
}
if (do_all)