diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-09-30 23:38:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-30 23:38:24 -0700 |
| commit | 69de8cc8527dc45a7aef76e8f1ace45b509b3712 (patch) | |
| tree | a1eedc952588f20afe95e8488e2f4664b13dc597 /builtin-repo-config.c | |
| parent | dd0c367e5e1358539bdd11c3a474bb6792504d30 (diff) | |
| parent | f7661ce0b8ee068e53d57249625199dda2829e30 (diff) | |
| download | git-69de8cc8527dc45a7aef76e8f1ace45b509b3712.tar.gz | |
Merge branch 'jc/gitpm'
* jc/gitpm: (52 commits)
Remove -fPIC which was only needed for Git.xs
Git.pm: Kill Git.xs for now
Revert "Make it possible to set up libgit directly (instead of from the environment)"
Revert "Git.pm: Introduce fast get_object() method"
Revert "Convert git-annotate to use Git.pm"
Fix compilation with Sun CC
pass DESTDIR to the generated perl/Makefile
Eliminate Scalar::Util usage from private-Error.pm
Convert git-annotate to use Git.pm
Git.pm: Introduce fast get_object() method
Make it possible to set up libgit directly (instead of from the environment)
Work around sed and make interactions on the backslash at the end of line.
Git.pm: Introduce ident() and ident_person() methods
Convert git-send-email to use Git.pm
Git.pm: Add config() method
Use $GITPERLLIB instead of $RUNNING_GIT_TESTS and centralize @INC munging
INSTALL: a tip for running after building but without installing.
Perly Git: make sure we do test the freshly built one.
Git.pm: Don't #define around die
Git.xs: older perl do not know const char *
...
Diffstat (limited to 'builtin-repo-config.c')
| -rw-r--r-- | builtin-repo-config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-repo-config.c b/builtin-repo-config.c index 9cf12d32e5..f60cee1dc5 100644 --- a/builtin-repo-config.c +++ b/builtin-repo-config.c @@ -119,7 +119,7 @@ static int get_value(const char* key_, const char* regex_) if (do_all) ret = !seen; else - ret = (seen == 1) ? 0 : 1; + ret = (seen == 1) ? 0 : seen > 1 ? 2 : 1; free_strings: free(repo_config); |