mirror of
https://github.com/git/git.git
synced 2024-11-08 14:09:26 +01:00
4960e5c7bd
To store the strategy options rebase prepends " --" to each one and writes them to a file. To load them it reads the file and passes the contents to split_cmdline(). This roughly mimics the behavior of the scripted rebase but has a couple of limitations, (1) options containing whitespace are not properly preserved (this is true of the scripted rebase as well) and (2) options containing '"' or '\' are incorrectly parsed and may cause the parser to return an error. Fix these limitations by quoting each option when they are stored so that they can be parsed correctly. Now that "--preserve-merges" no longer exist this change also stops prepending "--" to the options when they are stored as that was an artifact of the scripted rebase. These changes are backwards compatible so the files written by an older version of git can still be read. They are also forwards compatible, the file can still be parsed by recent versions of git as they treat the "--" prefix as optional. Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 lines
441 B
C
16 lines
441 B
C
#ifndef ALIAS_H
|
|
#define ALIAS_H
|
|
|
|
struct strbuf;
|
|
struct string_list;
|
|
|
|
char *alias_lookup(const char *alias);
|
|
/* Quote argv so buf can be parsed by split_cmdline() */
|
|
void quote_cmdline(struct strbuf *buf, const char **argv);
|
|
int split_cmdline(char *cmdline, const char ***argv);
|
|
/* Takes a negative value returned by split_cmdline */
|
|
const char *split_cmdline_strerror(int cmdline_errno);
|
|
void list_aliases(struct string_list *list);
|
|
|
|
#endif
|