Re: [PATCH v0 3/3] Build in git-rebase.sh
- From
Nguyen Thai Ngoc Duy <pclouds@gmail.com>
- Date
- May 21, 2009, 10:44 UTC
- Message-ID
- <fcaeb9bf0905210344h7ac8e10bx311bf9d714573eeb@mail.gmail.com>
- In-Reply-To
- <m363fukb3j.fsf@localhost.localdomain>
2009/5/21 Jakub Narebski <jnareb@gmail.com>:
Show 20 quoted lines
> Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes: > >> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> >> --- >> Regression: "-M" is gone. Don't really want to mess up struct option for "-M" >> >> Makefile | 2 +- >> builtin-rebase.c | 992 ++++++++++++++++++++++++++++++++++++++++ >> builtin.h | 1 + >> contrib/examples/git-rebase.sh | 530 +++++++++++++++++++++ >> git-rebase.sh | 530 --------------------- >> git.c | 1 + >> 6 files changed, 1525 insertions(+), 531 deletions(-) >> create mode 100644 builtin-rebase.c >> create mode 100755 contrib/examples/git-rebase.sh >> delete mode 100755 git-rebase.sh > > You should have used -M option to git-format-patch to make it clear > that this patch moves git-rebase.sh to contrib/examples/git-rebase.sh > without changes.
Yes, much shorter patch. I recall some issues about reversable patch long ago so I did not bother finding this option.
Show 15 quoted lines
> [...] >> +#define REBASE_ABORT 0x0001 >> +#define REBASE_CONTINUE 0x0002 >> +#define REBASE_FORCE 0x0004 >> +#define REBASE_IGNORE_DATE 0x0008 >> +#define REBASE_INTERACTIVE 0x0010 >> +#define REBASE_MERGE 0x0020 >> +#define REBASE_STAT 0x0040 >> +#define REBASE_NO_VERIFY 0x0080 >> +#define REBASE_PRESERVE_MERGES 0x0100 >> +#define REBASE_ROOT 0x0200 >> +#define REBASE_SKIP 0x0400 >> +#define REBASE_VERBOSE 0x0800 > > I see misaligns here...
Hmm.. it's perfectly aligned in complete source form. Probably because of TABs.
> [...] > > Couldn't you use parseopt also in subcommands?
I don't understand. You mean parseopt for --continue, --skip and --abort?
-- Duy