From: Johannes Sixt <j.sixt@viscovery.net>
To: Adam Piatyszek <ediap@wp.pl>
Cc: git@vger.kernel.org
Subject: Re: git rebase +
Date: Thu, 13 Oct 2011 15:21:37 +0200 [thread overview]
Message-ID: <4E96E5E1.7010103@viscovery.net> (raw)
In-Reply-To: <loom.20111013T134405-495@post.gmane.org>
Am 10/13/2011 13:48, schrieb Adam Piatyszek:
> In the middle of "git rebase --continue" process I hit Ctrl+C today to break
> this operation. When I tried to replay the same command it errors out with the
> following problem:
> /project/dfttools/libexec/git-core/git-rebase--interactive: line 650:
> /home/ediap/project.git/.git/rebase-merge/author-script: No such file or
> directory
>
> Is this an expected behavior?
Hitting Ctrl-C during git-rebase results undefined behavior. git-rebase is
a shell script and was never designed to operate in any form of atomicity.
You should have let it run until it stopped. Then you could have said 'git
rebase --abort' (if it didn't complete) or 'git reset --hard ORIG_HEAD'
(if it completed).
-- Hannes
next prev parent reply other threads:[~2011-10-13 13:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-13 11:48 git rebase + Adam Piatyszek
2011-10-13 13:21 ` Johannes Sixt [this message]
2011-10-14 5:26 ` interrupting "git rebase" (Re: git rebase +) Jonathan Nieder
2011-10-14 5:29 ` Jonathan Nieder
2011-10-15 15:23 ` Martin von Zweigbergk
2011-10-15 19:44 ` Jonathan Nieder
2011-10-17 10:03 ` Ramkumar Ramachandra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E96E5E1.7010103@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=ediap@wp.pl \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).