diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-01-13 12:17:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-13 21:00:01 (GMT) |
| commit | b5496d484d244bc291db0973466b76e7f679cb9f (patch) | |
| tree | bac8ae3915b6993b8600612fdf1f3ba5e5709731 /builtin/remote.c | |
| parent | f5eb87b98dd6aa587683057b9f5bd063e682e145 (diff) | |
| download | git-b5496d484d244bc291db0973466b76e7f679cb9f.zip git-b5496d484d244bc291db0973466b76e7f679cb9f.tar.gz git-b5496d484d244bc291db0973466b76e7f679cb9f.tar.bz2 | |
remote: handle the config setting branch.*.rebase=interactive
The config variable branch.<branchname>.rebase is not only used by `git
pull`, but also by `git remote` when showing details about a remote.
Therefore, it needs to be taught to accept the newly-introduced
`interactive` value of said variable.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/remote.c')
| -rw-r--r-- | builtin/remote.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/builtin/remote.c b/builtin/remote.c index 6694cf2..2b2ff9b 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -251,7 +251,7 @@ static int add(int argc, const char **argv) struct branch_info { char *remote_name; struct string_list merge; - int rebase; + enum { NO_REBASE, NORMAL_REBASE, INTERACTIVE_REBASE } rebase; }; static struct string_list branch_list; @@ -311,7 +311,9 @@ static int config_read_branches(const char *key, const char *value, void *cb) if (v >= 0) info->rebase = v; else if (!strcmp(value, "preserve")) - info->rebase = 1; + info->rebase = NORMAL_REBASE; + else if (!strcmp(value, "interactive")) + info->rebase = INTERACTIVE_REBASE; } } return 0; @@ -980,7 +982,9 @@ static int show_local_info_item(struct string_list_item *item, void *cb_data) printf(" %-*s ", show_info->width, item->string); if (branch_info->rebase) { - printf_ln(_("rebases onto remote %s"), merge->items[0].string); + printf_ln(_(branch_info->rebase == INTERACTIVE_REBASE ? + "rebases interactively onto remote %s" : + "rebases onto remote %s"), merge->items[0].string); return 0; } else if (show_info->any_rebase) { printf_ln(_(" merges with remote %s"), merge->items[0].string); |