mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
88f8576eda
When 46af44b07d (pull --rebase=<type>: allow single-letter abbreviations
for the type, 2018-08-04) landed in Git, it had the side effect that
not only 'pull --rebase=<type>' accepted the single-letter abbreviations
but also the 'pull.rebase' and 'branch.<name>.rebase' configurations.
However, 'git remote rename' did not honor these single-letter
abbreviations when reading the 'branch.*.rebase' configurations.
We now document the single-letter abbreviations and both code places
share a common function to parse the values of 'git pull --rebase=*',
'pull.rebase', and 'branches.*.rebase'.
The only functional change is the handling of the `branch_info::rebase`
value. Before it was an unsigned enum, thus the truth value could be
checked with `branch_info::rebase != 0`. But `enum rebase_type` is
signed, thus the truth value must now be checked with
`branch_info::rebase >= REBASE_TRUE`
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 lines
244 B
C
15 lines
244 B
C
#ifndef REBASE_H
|
|
#define REBASE_H
|
|
|
|
enum rebase_type {
|
|
REBASE_INVALID = -1,
|
|
REBASE_FALSE = 0,
|
|
REBASE_TRUE,
|
|
REBASE_PRESERVE,
|
|
REBASE_MERGES,
|
|
REBASE_INTERACTIVE
|
|
};
|
|
|
|
enum rebase_type rebase_parse_value(const char *value);
|
|
|
|
#endif /* REBASE */
|