From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Sat, 06 Nov 2010 02:03:12 GMT
Subject: Re: Refactoring git-rebase.sh and git-rebase--interactive.sh
Message-ID: <AANLkTinSb09oZHN8br5goeoG2b+Cgra88E1qeLqi-Y=z@mail.gmail.com>
In-Reply-To: <AANLkTimeWDbJPor9PnKgW5sD7DLjqrm-vTzEtnARvP3M@mail.gmail.com>

I have now removed all the command line processing from
git-rebase--interactive.sh. I think the next step will be to align the
order of the validation steps between the two script files. When that is
done, I will remove one step at a time from git-rebase--interactive.sh
while simultaneously moving down the call to it from git-rebase.sh.

To avoid going off in the wrong direction, I would appreciate your input
on the order of the validation steps. I was thinking about having them
in this order:
1. Check command line
2. a. If --continue, --skip or --abort requested, rebase-apply/ or
      rebase-merge/ must exist. (What if -i is also passed and
	  rebase-apply/ exists?)
   b. Otherwise, rebase-apply/ or rebase-merge/ must not exist
3. Check that references, such as upstream and onto, are valid
4. Check that working tree is clean
5. Run pre-rebase hook

What do you think?

rebase -i currently checks that GIT_COMMITTER_IDENT is set. Should that
be checked and if so, should it only be checked if the rebase is
interactive?

/Martin