git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/3] Teach 'git remote' that the config var branch.*.rebase can be 'interactive'

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Jan 13, 2016, 09:42 UTC
Message-ID
<vpq7fjdyfvu.fsf@anie.imag.fr>
In-Reply-To
<8c98523f8a3f2c6f2f3db1e4572e05c28f94688d.1452612112.git.johannes.schindelin@gmx.de>
Johannes Schindelin <johannes.schindelin@gmx.de> writes:
Show 24 quoted lines
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>  builtin/remote.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/remote.c b/builtin/remote.c
> index 6694cf2..0af8300 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;
> @@ -312,6 +312,8 @@ static int config_read_branches(const char *key, const char *value, void *cb)
>  				info->rebase = v;
>  			else if (!strcmp(value, "preserve"))
>  				info->rebase = 1;
> +			else if (!strcmp(value, "interactive"))
> +				info->rebase = INTERACTIVE_REBASE;

What happens if one has branch.*.rebase=interactive, and wants to make an exception? Does

  git pull --rebase=true

cancel the 'interactive' part? I guess it is, but if so I think it should be tested and documented.

Anyway, thanks for the patch.
-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 8 of 27 in “Support `git pull --rebase=interactive`”
  1. 0/3 Support `git pull --rebase=interactive`Johannes Schindelin, Jan 12, 2016
  2. 1/3 Teach 'git pull' to handle --rebase=interactiveJohannes Schindelin, Jan 12, 2016
  3. Junio C HamanoJan 12, 2016
  4. Johannes SchindelinJan 13, 2016
  5. 2/3 Teach 'git remote' that the config var branch.*.rebase can be 'interactive'Johannes Schindelin, Jan 12, 2016
  6. Junio C HamanoJan 12, 2016
  7. Johannes SchindelinJan 13, 2016
  8. Matthieu MoyJan 13, 2016
  9. Johannes SchindelinJan 13, 2016
  10. Matthieu MoyJan 13, 2016
  11. Johannes SchindelinJan 13, 2016
  12. 3/3 completion: add missing branch.*.rebase valuesJohannes Schindelin, Jan 12, 2016
  13. Junio C HamanoJan 12, 2016
  14. 0/3 Support `git pull --rebase=interactive`Johannes Schindelin, Jan 13, 2016
  15. 1/3 pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin, Jan 13, 2016
  16. Paul TanJan 13, 2016
  17. Johannes SchindelinJan 13, 2016
  18. Junio C HamanoJan 13, 2016
  19. Johannes SchindelinJan 13, 2016
  20. Junio C HamanoJan 13, 2016
  21. 2/3 remote: handle the config setting branch.*.rebase=interactiveJohannes Schindelin, Jan 13, 2016
  22. 3/3 completion: add missing branch.*.rebase valuesJohannes Schindelin, Jan 13, 2016
  23. 0/3 Support `git pull --rebase=interactive`Johannes Schindelin, Jan 13, 2016
  24. 1/3 pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin, Jan 13, 2016
  25. 2/3 remote: handle the config setting branch.*.rebase=interactiveJohannes Schindelin, Jan 13, 2016
  26. 3/3 completion: add missing branch.*.rebase valuesJohannes Schindelin, Jan 13, 2016
  27. Junio C HamanoJan 13, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.