From: "Adeodato Simó" <dato@net.com.org.es>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: jidanni@jidanni.org, git@vger.kernel.org
Subject: Re: rebase-merge/done: No such file or directory
Date: Tue, 13 Jan 2009 00:02:28 +0100 [thread overview]
Message-ID: <20090112230228.GA28545@chistera.yi.org> (raw)
In-Reply-To: <alpine.DEB.1.00.0901122342420.3586@pacific.mpi-cbg.de>
* Johannes Schindelin [Mon, 12 Jan 2009 23:47:47 +0100]:
> > $DONE might not exist. Do test -f $DONE before you grep it.
> I cannot reproduce here. Since all the files in .git/rebase-merge/ are
> internal files to rebase--interactive, I think we do not have to guard
> against any possible user action rendering assumptions about internals
> invalid.
> Wasting a minute, I seem to understand why I cannot reproduce. Just
> looking all of _two_ lines above the line you mentioned:
> sed -e 1q < "$TODO" >> "$DONE"
> Hrmpf. You're right. The user could have removed "$DONE"e between the
> two lines ;-)
No, not really. Start a rebase -i. Change the *first* "pick" to a
"squash". Save and exit the editor. You'll see the output jidanni
mentioned:
grep: .git/rebase-merge/done: No such file or directory
Cannot 'squash' without a previous commit
The second line tells the user what happened (what their error was), but
I guess we could do without the first one.
--
Adeodato Simó dato at net.com.org.es
Debian Developer adeodato at debian.org
Debugging is twice as hard as writing the code in the first place. Therefore,
if you write the code as cleverly as possible, you are, by definition, not
smart enough to debug it.
-- Brian W. Kernighan
next prev parent reply other threads:[~2009-01-12 23:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-12 19:13 rebase-merge/done: No such file or directory jidanni
2009-01-12 22:47 ` Johannes Schindelin
2009-01-12 23:02 ` Adeodato Simó [this message]
2009-01-12 23:09 ` [PATCH] Avoid spurious error messages on error mistakes Pierre Habouzit
2009-01-13 8:20 ` Junio C Hamano
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=20090112230228.GA28545@chistera.yi.org \
--to=dato@net.com.org.es \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jidanni@jidanni.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).