* [PATCH] Improve error message in rebase conflict
@ 2010-05-30 12:20 Ramkumar Ramachandra
2010-05-30 12:44 ` Sverre Rabbelier
0 siblings, 1 reply; 3+ messages in thread
From: Ramkumar Ramachandra @ 2010-05-30 12:20 UTC (permalink / raw)
To: Git Mailing List; +Cc: Dale Rowley, Junio C Hamano
When the index is unchanged during a rebase conflict resolution,
prompt the user to "git add", or alternatively drop the patch using
"git rebase --skip".
Noticed-by: Dale Rowley <ddrowley@gmail.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
git-am.sh | 4 +++-
git-rebase.sh | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 87ffae2..3c46f60 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -725,7 +725,9 @@ do
# working tree.
resolved=
git diff-index --quiet --cached HEAD -- && {
- echo "No changes - did you forget to use 'git add'?"
+ echo "No changes - did you forget to use 'git add'? " \
+ "If you dropped the changes introduced by the patch, " \
+ "you should use \"$cmdline --skip\"."
stop_here_user_resolve $this
}
unmerged=$(git ls-files -u)
diff --git a/git-rebase.sh b/git-rebase.sh
index 44f5c65..60cc0e9 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -217,8 +217,8 @@ do
die "No rebase in progress?"
git diff-files --quiet --ignore-submodules || {
- echo "You must edit all merge conflicts and then"
- echo "mark them as resolved using git add"
+ echo "You must edit all merge conflicts and then" \
+ "mark them as resolved using 'git add'"
exit 1
}
if test -d "$dotest"
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Improve error message in rebase conflict
2010-05-30 12:20 [PATCH] Improve error message in rebase conflict Ramkumar Ramachandra
@ 2010-05-30 12:44 ` Sverre Rabbelier
2010-05-30 13:35 ` Ramkumar Ramachandra
0 siblings, 1 reply; 3+ messages in thread
From: Sverre Rabbelier @ 2010-05-30 12:44 UTC (permalink / raw)
To: Ramkumar Ramachandra; +Cc: Git Mailing List, Dale Rowley, Junio C Hamano
Heya,
On Sun, May 30, 2010 at 14:20, Ramkumar Ramachandra <artagnon@gmail.com> wrote:
> git diff-files --quiet --ignore-submodules || {
> - echo "You must edit all merge conflicts and then"
> - echo "mark them as resolved using git add"
> + echo "You must edit all merge conflicts and then" \
> + "mark them as resolved using 'git add'"
Why is this change not described in the commit message? :)
--
Cheers,
Sverre Rabbelier
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Improve error message in rebase conflict
2010-05-30 12:44 ` Sverre Rabbelier
@ 2010-05-30 13:35 ` Ramkumar Ramachandra
0 siblings, 0 replies; 3+ messages in thread
From: Ramkumar Ramachandra @ 2010-05-30 13:35 UTC (permalink / raw)
To: Sverre Rabbelier; +Cc: Git Mailing List, Dale Rowley, Junio C Hamano
Hi,
Sverre Rabbelier wrote:
> Why is this change not described in the commit message? :)
I thought it was too trivial to describe. Anyway, here's one:
++ Additionally, fix a line break in a message in git-rebase.sh
-- Ram
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-05-30 13:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-05-30 12:20 [PATCH] Improve error message in rebase conflict Ramkumar Ramachandra
2010-05-30 12:44 ` Sverre Rabbelier
2010-05-30 13:35 ` Ramkumar Ramachandra
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.