From: Dmitry Potapov <dpotapov@gmail.com>
To: git@vger.kernel.org
Subject: git-rebase--interactive needs a better message
Date: Mon, 24 Sep 2007 02:45:02 +0400 [thread overview]
Message-ID: <20070923224502.GB7249@potapov> (raw)
I have tried to use git-rebase --interactive today, and run into a strange
error message saying:
/usr/bin/git-rebase--interactive: line 333: $GIT_DIR/.dotest-merge/author-script: No such file or directory
I had to scratch my head for a while before I realized that I forgot to
say git-commit. So, it was mine mistake, but I think that it should be
possible to have a better error message suggesting the user what to do.
I have looked at the git-rebase--interactive script, but I am not sure
that I understand it good enough to propose a patch.
To reproduce the problem, run the following script in an empty directory:
===
#!/bin/sh
set -e
git-init
echo 'version 1' > foo
git-add foo
git-commit -m 'commit 1' foo
echo 'versionn 2' >> foo
git-commit -m 'commit 2' foo
echo 'version 3' >> foo
git-commit -m 'commit 3' foo
GIT_EDITOR='sed -i -e "/commit 2/{s/^pick/edit/}"' git-rebase -i HEAD~2
sed -i -e "s/versionn/version/" foo
git-update-index foo
# Missing git-commit --amend
git-rebase --continue
===
Error message:
==
/usr/bin/git-rebase--interactive: line 333: /tmp/zzz/.git/.dotest-merge/author-script: No such file or directory
===
I use git version 1.5.3.1
Dmitry Potapov
next reply other threads:[~2007-09-23 22:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-23 22:45 Dmitry Potapov [this message]
2007-09-23 23:56 ` git-rebase--interactive needs a better message Johannes Schindelin
2007-09-24 0:29 ` [PATCH] rebase -i: commit when continuing after "edit" Johannes Schindelin
2007-09-24 9:11 ` Dmitry Potapov
2007-09-25 5:37 ` Junio C Hamano
2007-09-25 12:32 ` Johannes Schindelin
2007-09-25 13:26 ` Johannes Sixt
2007-09-25 13:50 ` Johannes Schindelin
2007-09-25 14:17 ` Johannes Sixt
2007-09-25 14:31 ` Johannes Schindelin
2007-09-25 15:01 ` Johannes Sixt
2007-09-25 15:16 ` Johannes Schindelin
2007-09-25 14:46 ` David Kastrup
2007-09-25 15:54 ` Johannes Sixt
2007-09-25 16:04 ` David Kastrup
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070923224502.GB7249@potapov \
--to=dpotapov@gmail.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).