Skip to main content

Browse the archive

Revision 06de561830250f92e056b0a57bc52b27b13ba2ac authored by Junio C Hamano on 03 June 2012, 22:52:18 UTC, committed by Junio C Hamano on 03 June 2012, 22:52:18 UTC 
Merge branch 'ef/maint-rebase-error-message' into maint
 
When "git rebase" was given a bad commit to replay the history on,
its error message did not correctly give the command line argument
it had trouble parsing.

By Erik Faye-Lund
* ef/maint-rebase-error-message:
  rebase: report invalid commit correctly
2 parent s 6a6d72b + 9180fea
Raw File
sequencer.h 
#ifndef SEQUENCER_H
#define SEQUENCER_H

#define SEQ_DIR		"sequencer"
#define SEQ_HEAD_FILE	"sequencer/head"
#define SEQ_TODO_FILE	"sequencer/todo"
#define SEQ_OPTS_FILE	"sequencer/opts"

enum replay_action {
	REPLAY_REVERT,
	REPLAY_PICK
};

enum replay_subcommand {
	REPLAY_NONE,
	REPLAY_REMOVE_STATE,
	REPLAY_CONTINUE,
	REPLAY_ROLLBACK
};

struct replay_opts {
	enum replay_action action;
	enum replay_subcommand subcommand;

	/* Boolean options */
	int edit;
	int record_origin;
	int no_commit;
	int signoff;
	int allow_ff;
	int allow_rerere_auto;

	int mainline;

	/* Merge strategy */
	const char *strategy;
	const char **xopts;
	size_t xopts_nr, xopts_alloc;

	/* Only used by REPLAY_NONE */
	struct rev_info *revs;
};

/* Removes SEQ_DIR. */
extern void remove_sequencer_state(void);

int sequencer_pick_revisions(struct replay_opts *opts);

#endif
back to top