Re: [PATCH v6 0/4] Add --base option to git-format-patch to record base tree info

From: Stefan Beller <sbeller@google.com>
Date: Apr 26, 2016, 17:21 UTC
Message-ID: <CAGZ79kajpAtbHaKLaLHN5+qUOvBofFs-q-vUYWua49GWK7FO9Q@mail.gmail.com>
In-Reply-To: <1461657084-9223-1-git-send-email-xiaolong.ye@intel.com>

On Tue, Apr 26, 2016 at 12:51 AM, Xiaolong Ye <xiaolong.ye@intel.com> wrote:

Show 12 quoted lines

> Thanks for Junio's reviews and suggestions.
>
> This version contains the following changes since v5:
>
>  - Fix a decl-after-statement in patch 3/4.
>
>  - Improve testcases to cover more scenarios and make them more portable and
>    readable.
>
> Thanks,
> Xiaolong
>

Thanks for this feature!

I am playing around with this series, and here comes a feature request: I have a local branch with no upstream set. My usual workflow is like this

    git checkout origin/master
    # toy around, do stuff
    git checkout -b new-shiny-feature
    git format-patch origin-master..

Now I have set the format.useautobase option and then the `git format-patch` fails with

    fatal: Failed to get upstream, if you want to record base commit
automatically,
    please use git branch --set-upstream-to to track a remote branch.
    Or you could specify base commit by --base=<base-commit-id> manually.

but as I indicated I want patches from origin/master onwards, Could we make use of that information? To record the base in my workflow currently I need to do:

    git format-patch origin/master.. --base=origin/master

which seems redundant to me. (I may be holding it wrong though? Should I try to set upstream branches for my local branches? This seems weird to me as I cannot push/change the upstream branches directly, as Junio owns the branches)

Thanks, Stefan