{"thread":{"id":"14969","subject":"git-rebase --merge gets stuck on --skip","startedAt":"2008-08-13T01:51:01Z","lastAt":"2008-08-13T01:51:01Z","messageCount":1,"participants":["Marius Vollmer"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"86995","messageId":"87y731adiy.fsf@uni-dortmund.de","threadId":"14969","inReplyTo":null,"subject":"git-rebase --merge gets stuck on --skip","fromName":"Marius Vollmer","fromEmail":"marius.vollmer@uni-dortmund.de","sentAt":"2008-08-13T01:51:01Z","receivedAt":"2008-08-13T01:51:01Z","isPatch":false,"sender":{"key":"marius.vollmer@uni-dortmund.de","avatar":null},"body":"Hi,\n\nI might have found a bug with \"git-rebase --merge\".\n\nWhen skipping over more than one commit in a row, only the first skip\nhas any effect.  The second and subsequent skips do not change the state\nin .git/.dotest-merge.\n\nThis works fine with the regular git-rebase.\n\nI use Debian's git-core 1:1.5.6.3-1.1.  I haven't tried newer versions.\n\nHow to reproduce:\n\n  $ git clone http://zagadka.vm.bytemark.co.uk/git/project2.git\n  $ cd project2/\n  $ git checkout -b dev-1 origin/dev-1\n  $ git rebase --merge master\n  (fails with a conflict)\n  $ cat .git/.dotest-merge/msgnum\n  1\n  $ git rebase --skip\n  (fails with a different conflict)\n  $ cat .git/.dotest-merge/msgnum\n  1\n  $ git rebase --skip\n  (fails with the same conflict again)\n  $ cat .git/.dotest-merge/msgnum\n  1\n  $ git rebase --skip\n  $ cat .git/.dotest-merge/msgnum\n  1\n  $ git rebase --skip\n  $ cat .git/.dotest-merge/msgnum\n  1\n  $ git rebase --skip\n  $ cat .git/.dotest-merge/msgnum\n  1\n\nAnd so on ad infinitum...\n\nIn contrast, git-rebase without --merge eventually finishes:\n\n  $ git clone http://zagadka.vm.bytemark.co.uk/git/project2.git\n  $ cd project2/\n  $ git checkout -b dev-1 origin/dev-1\n  $ git rebase master\n  (fails with a conflict)\n  $ cat .dotest/next\n  1\n  $ git rebase --skip\n  $ cat .dotest/next\n  2\n  $ git rebase --skip\n  $ cat .dotest/next\n  3\n  $ git rebase --skip\n  HEAD is now at 060b191 Master 2.\n  Nothing to do.\n"}]}