From: Jared Hance Date: Thu, 10 Feb 2011 23:40:08 GMT Subject: [PATCH v4 4/5] merge: introduce per-branch-configuration helper function Message-ID: <1297381209-6377-9-git-send-email-jaredhance@gmail.com> In-Reply-To: <1297381209-6377-1-git-send-email-jaredhance@gmail.com> Create a new function that will hold configuration code for configuration values that are specified per branch, as suggested by Junio. Signed-off-by: Jared Hance --- builtin/merge.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index cd23880..71b392d 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -522,8 +522,20 @@ static int per_branch_config(const char *k, const char *v, void *cb) parse_options(argc, argv, NULL, builtin_merge_options, builtin_merge_usage, 0); free(buf); + + return 0; } + return 1; /* not what I handle */ +} + +static int git_merge_config(const char *k, const char *v, void *cb) +{ + int status = per_branch_config(k, v, cb); + + if (status <= 0) + return status; + if (!strcmp(k, "merge.diffstat") || !strcmp(k, "merge.stat")) show_diffstat = git_config_bool(k, v); else if (!strcmp(k, "pull.twohead")) -- 1.7.4