undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote: handle the config setting branch.*.rebase=interactive

Browse Source 
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>
This commit is contained in:
Johannes Schindelin 2016-01-13 13:17:19 +01:00 committed by Junio C Hamano
parent f5eb87b98d
commit b5496d484d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/remote.c
View File

@ -251,7 +251,7 @@ static int add(int argc, const char **argv)
struct branch_info { struct branch_info {
char *remote_name; char *remote_name;
struct string_list merge; struct string_list merge;
int rebase; enum { NO_REBASE, NORMAL_REBASE, INTERACTIVE_REBASE } rebase;
}; };
static struct string_list branch_list; 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) if (v >= 0)
info->rebase = v; info->rebase = v;
else if (!strcmp(value, "preserve")) else if (!strcmp(value, "preserve"))
info->rebase = 1; info->rebase = NORMAL_REBASE;
else if (!strcmp(value, "interactive"))
info->rebase = INTERACTIVE_REBASE;
} }
} }
return 0; 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); printf(" %-*s ", show_info->width, item->string);
if (branch_info->rebase) { 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; return 0;
} else if (show_info->any_rebase) { } else if (show_info->any_rebase) {
printf_ln(_(" merges with remote %s"), merge->items[0].string); printf_ln(_(" merges with remote %s"), merge->items[0].string);