Re: [PATCH v1] rebase --root: sentinel commit cloaks empty commits

2014-07-20 Thread Chris Webb
Thomas Rast wrote: >> Please take a closer look at the last two test cases that specify the >> expected behaviour of rebasing a branch that tracks the empty tree. >> At this point they expect the "Nothing to do" error (aborts with >> untouched history). This is consistent with rebasing only empty

Re: [PATCH v1] rebase --root: sentinel commit cloaks empty commits

2014-07-18 Thread Thomas Rast
Hi Fabian Impressive analysis! > Concerning the bugfix: Obviously, the patch misuses the `squash_onto` > flag because it assumes that the new base is empty except for the > sentinel commit. The variable name does not imply anything close to > that. An additional flag to disable the use of the git

[PATCH v1] rebase --root: sentinel commit cloaks empty commits

2014-07-16 Thread Fabian Ruch
git-rebase supports the option `--root` both with and without `--onto`. In rebase root mode it replays all commits reachable from a branch on top of another branch, including the very first commit. In case `--onto` is not specified, that other branch is temporarily provided by creating an empty com