{"thread":{"id":"36331","subject":"[BUG?] git-revert ignores --no-commit on conflicts","startedAt":"2014-04-01T13:24:54Z","lastAt":"2014-04-01T13:24:54Z","messageCount":1,"participants":["Florian Bruhin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"238203","messageId":"20140401132454.GQ9499@lupin","threadId":"36331","inReplyTo":null,"subject":"[BUG?] git-revert ignores --no-commit on conflicts","fromName":"Florian Bruhin","fromEmail":"me@the-compiler.org","sentAt":"2014-04-01T13:24:54Z","receivedAt":"2014-04-01T13:24:54Z","isPatch":false,"sender":{"key":"me@the-compiler.org","avatar":null},"body":"Hi,\n\nI found something which seems to be a bug to me (or well, maybe I'm\ndoing something wrong...). When I revert a commit with -n/--no-commit\nand there's a conflict, when doing \"git revert --continue\" I get an\neditor, even though I wouldn't expect that to happen.\n\nExample:\n\n    $ git init\n    Initialized empty Git repository in [...]\n    $ echo foo > file\n    $ git add file\n    $ git commit -m \"Initial commit\"\n    [master (root-commit) 9f8e5fb] Initial commit\n     1 file changed, 1 insertion(+)\n     create mode 100644 file\n    $ echo bar > file\n    $ git commit -am \"foo -> bar\"\n    [master e53d99f] foo -> bar\n     1 file changed, 1 insertion(+), 1 deletion(-)\n    $ echo baz > file\n    $ git commit -am \"bar -> baz\"\n    [master fa3c23f] bar -> baz\n     1 file changed, 1 insertion(+), 1 deletion(-)\n    $ git revert -n HEAD  # this works as expected\n    $ git revert --abort\n    $ git revert -n e53d99f  # reverting the middle commit to provoke a conflict\n    error: could not revert e53d99f... foo -> bar\n    hint: after resolving the conflicts, mark the corrected paths\n    hint: with 'git add <paths>' or 'git rm <paths>'\n    $ echo fish > file\n    $ git add file\n    $ git revert --continue  # here my editor opens\n    Aborting commit due to empty commit message.\n\nTested using git 1.9.1 and 1.9.0.msysgit.0.\n\nFlorian\n\n-- \n() ascii ribbon campaign - stop html mail    www.asciiribbon.org\n/\\ www.the-compiler.org  | I love long mails http://email.is-not-s.ms/\nLove is never asking why? \n"}]}