From: Junio C Hamano Date: Wed, 26 Jul 2017 21:56:40 GMT Subject: Re: [RFC PATCH 0/5] Add option to autostage changes when continuing a rebase Message-ID: In-Reply-To: Junio C Hamano writes: > Phillip Wood writes: > >> From: Phillip Wood >> >> These patches add an '--autostage' option (and corresponding config >> variable) to 'rebase --continue' that will stage any unstaged changes >> before continuing. This saves the user having to type 'git add' before >> running 'git rebase --continue'. > > I wonder if this interacts with existing rerere.autoupdate > configuration variable and if so how (i.e. would they conflict and > fight with each other? would they work well together? would one of > them make the other unnecessary?). In any case, they look closely > related and perhaps should be named similarly. > > I even have a suspicion that they may be essentially doing the same > thing. > > For a previous discussion, you start from here: > > https://public-inbox.org/git/7vej6xb4lr.fsf@gitster.siamese.dyndns.org/#t > > and for the context, look at the original post by Ingo, to which the > above message is a response to. > > Thanks. Hmph, this is interesting. "git rebase" does take "--rerere-autoupdate" option from the command line, and propagates it to a later invocation of "rebase --continue" by storing the value to $state_dir/allow_rerere_autoupdate file and reading the value from it. $allow_rerere_autoupdate shell variable is used to hold the setting. I'd expect that this variable to be used in invocations of "git am" in git-rebase--am.sh; but that does not seem to be the case. I wonder if this was once working but over time we broke the feature without anybody noticing it, or if the support was added but not completed and the feature was a no-op from the beginning?