builtin/pull.c: use config value of autostash

[john-cai]

A bug in pull.c causes merge and rebase functions to ignore
rebase.autostash if it is only set in the config.

There are a couple of different scenarios that we need to be mindful of:

1. --autostash passed in through command line

$ git pull --autostash

merge/rebase should get --autostashed passed through

2. --rebase passed in, rebase.autostash set in config

$ git config rebase.autostash true
$ git pull --rebase

merge/rebase should get --autostash from config

3. --no-autostash passed in

$ git pull --no-autostash

--no-autostash should be passed into merge/rebase

4. rebase.autostash set but --rebase not used

$ git config rebase.autostash true
$ git pull

--autostash should not be passed into merge but not rebase

This change adjusts variable names to make it more clear which autostash
setting it is modifying, and ensures --autostash is passed into the
merge/rebase where appropriate.

cc: René Scharfe l.s.r@web.de
cc: Philippe Blain levraiphilippeblain@gmail.com
cc: Tilman Vogel tilman.vogel@web.de

[gitgitgadget-git]

There is an issue in commit c5e7035:
Commit not signed off

[gitgitgadget-git]

There is an issue in commit ecd7177:
Commit not signed off

[gitgitgadget-git]

There is an issue in commit fd8964d:
Commit not signed off

[gitgitgadget-git]

There is an issue in commit a720f1b:
Commit not signed off

[webstech]

@john-cai

Commit not signed off

It looks like you manually entered the sign off - Signed-Off-By. Git generated sign offs are Signed-off-by.

If this was generated by another tool let me know.

[gitgitgadget-git]

There is an issue in commit ba3496a:
Commit not signed off

[gitgitgadget-git]

There is an issue in commit c231881:
Commit not signed off

[gitgitgadget-git]

There is an issue in commit a305b73:
Commit not signed off

[john-cai]

/preview

[gitgitgadget-git]

There is an issue in commit a305b73:
Commit not signed off

[gitgitgadget-git]

There is an issue in commit b459152:
Commit not signed off

[gitgitgadget-git]

There is an issue in commit 5c0b8da:
Commit not signed off

[gitgitgadget-git]

There is an issue in commit 6e23e98:
Commit not signed off

[gitgitgadget-git]

There is an issue in commit 46c4f45:
Commit not signed off

[gitgitgadget-git]

There is an issue in commit 7139aeb:
Commit not signed off

[gitgitgadget-git]

There is an issue in commit 15eb361:
Commit not signed off

[john-cai]

thanks @webstech! yes I entered it manually. I've made a bad habit of this unfortunately.

@dscho I can't seem to make the GGG PR Handler happy 😢 is it an issue with my commit formatting?

[webstech]

thanks @webstech! yes I entered it manually. I've made a bad habit of this unfortunately.

@dscho I can't seem to make the GGG PR Handler happy 😢 is it an issue with my commit formatting?

Try letting git do it: git commit --amend --signoff --no-edit

btw, you have a capital 'O' in 'off'. GitHub seems to be more forgiving on the case.

[phil-blain]

This PR could be closed as this bug was fixed in 7a9ae6d