Re: Commit dropped when swapping commits with rebase -i -p

On 16/09/17 14:45, Sebastian Schuberth wrote: On Sat, Sep 16, 2017 at 12:41 PM, Andreas Heiduk wrote: Therefore I would avoid "definitive wording" like "will drop" and use vague wording along "there are various dragons out there" like this: The todo list presented

Re: Commit dropped when swapping commits with rebase -i -p

On Sat, Sep 16, 2017 at 12:41 PM, Andreas Heiduk wrote: > Therefore I would avoid "definitive wording" like "will drop" and use > vague wording along "there are various dragons out there" like this: > > The todo list presented by `--preserve-merges --interactive` does >

Re: Commit dropped when swapping commits with rebase -i -p

Am 15.09.2017 um 22:52 schrieb Junio C Hamano: > Sebastian Schuberth writes: >> >> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt >> index 6805a74aec..ccd0a04d54 100644 >> --- a/Documentation/git-rebase.txt >> +++ b/Documentation/git-rebase.txt >>

Re: Commit dropped when swapping commits with rebase -i -p

Sebastian Schuberth writes: > On 2017-09-02 02:04, Jonathan Nieder wrote: > >>> Anyway, this should really more explicitly say *what* you need to know >>> about, that is, reordering commits does not work. >> >> It tries to explain that, even with an example. If you have

Re: Commit dropped when swapping commits with rebase -i -p

On 2017-09-02 02:04, Jonathan Nieder wrote: >> Anyway, this should really more explicitly say *what* you need to know >> about, that is, reordering commits does not work. > > It tries to explain that, even with an example. If you have ideas for > improving the wording, that would be welcome.

Re: Commit dropped when swapping commits with rebase -i -p

Hi, Sebastian Schuberth wrote: > On Wed, Aug 30, 2017 at 8:07 PM, Martin Ågren wrote: >> The man-page for git rebase says that combining -p with -i is "generally >> not a good idea unless you know what you are doing (see BUGS below)". > > Thanks for pointing this out

Re: Commit dropped when swapping commits with rebase -i -p

Hi Sebastian, On Wed, 30 Aug 2017, Sebastian Schuberth wrote: > On Wed, Aug 30, 2017 at 10:28 PM, Johannes Schindelin > wrote: > > > Please see 'exchange two commits with -p' in t3404. This is a known > > Thank for pointing out the test. > > > breakage, and due to

Re: Commit dropped when swapping commits with rebase -i -p

On Wed, Aug 30, 2017 at 10:28 PM, Johannes Schindelin wrote: > Please see 'exchange two commits with -p' in t3404. This is a known Thank for pointing out the test. > breakage, and due to the fact that -p and -i are fundamentally > incompatible with one another (even

Re: Commit dropped when swapping commits with rebase -i -p

Hi Sebastian, On Wed, 30 Aug 2017, Sebastian Schuberth wrote: > I believe stumbled upon a nasty bug in Git: It looks like a commits gets > dropped during interactive rebase when asking to preserve merges. Please see 'exchange two commits with -p' in t3404. This is a known breakage, and due to

Re: Commit dropped when swapping commits with rebase -i -p

On Wed, Aug 30, 2017 at 8:07 PM, Martin Ågren wrote: > The man-page for git rebase says that combining -p with -i is "generally > not a good idea unless you know what you are doing (see BUGS below)". Thanks for pointing this out again. I remember to have read this some

Re: Commit dropped when swapping commits with rebase -i -p

On 30 August 2017 at 12:11, Sebastian Schuberth wrote: > Hi, > > I believe stumbled upon a nasty bug in Git: It looks like a commits gets > dropped during interactive rebase when asking to preserve merges. Steps: > > $ git clone -b git-bug --single-branch >

Commit dropped when swapping commits with rebase -i -p

Hi, I believe stumbled upon a nasty bug in Git: It looks like a commits gets dropped during interactive rebase when asking to preserve merges. Steps: $ git clone -b git-bug --single-branch https://github.com/heremaps/scancode-toolkit.git $ git rebase -i -p HEAD~2 # In the editor, swap the