Signed-off-by: Andrew Pimlott and...@pimlott.net
---
t/t7500-commit.sh |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
index 436b7b6..e166ac8 100755
--- a/t/t7500-commit.sh
+++ b/t/t7500-commit.sh
@@ -13,8 +13,8 @@ commit_msg_is
Signed-off-by: Andrew Pimlott and...@pimlott.net
---
t/lib-rebase.sh |2 ++
1 file changed, 2 insertions(+)
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index cfd3409..7f119e2 100644
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -17,6 +17,8 @@
# (squash, fixup, edit, or reword
Excerpts from Junio C Hamano's message of Thu Jun 27 13:50:45 -0700 2013:
Andrew Pimlott and...@pimlott.net writes:
I should update the function I introduced first. I will re-submit
the rebase -i --autosquash patch and wait for acceptance before
trying to fix other things.
Thanks
Excerpts from Junio C Hamano's message of Mon Jul 01 09:52:05 -0700 2013:
Wow. How could all of us missed this for a long time?
:-) I don't know, but little is more frustrating than a misleading
diagnostic.
BTW, I didn't expect git-send-email to send those two messages in a
thread. I'll keep
Excerpts from Junio C Hamano's message of Thu Jun 27 13:52:33 -0700 2013:
Two issues here, which I'll locally amend (no need to resend):
Great! Thank you for your help and patience.
cat expected -EOF
pick ...
...
EOF
test_cmp expected
Signed-off-by: Andrew Pimlott and...@pimlott.net
---
t/lib-rebase.sh |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 0b41155..7b42199 100644
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -24,8 +24,7 @@
#-- Add a blank line
Excerpts from Junio C Hamano's message of Thu Jun 27 11:37:31 -0700 2013:
Thanks, but it should probably be
write_script fake-editor.sh -\EOF
case $1 in
...
EOF
test_set_editor ...
if the aim is to modernize this part.
Yes, the goal is to make that
Excerpts from Andrew Pimlott's message of Wed Jun 26 17:20:32 -0700 2013:
Excerpts from Junio C Hamano's message of Wed Jun 26 16:48:57 -0700 2013:
Andrew Pimlott and...@pimlott.net writes:
In order to test this, I wrote a helper function to dump the rebase -i
todo list. Would you like
, or
combined? See below.
Andrew
---8---
Subject: [PATCH] lib-rebase: set_cat_todo_editor
Add a helper for testing rebase -i todo lists. This can be used to verify
the expected user experience, even for todo list changes that do not affect
the outcome of rebase.
Signed-off-by: Andrew Pimlott
Excerpts from Junio C Hamano's message of Wed Jun 26 16:48:57 -0700 2013:
Andrew Pimlott and...@pimlott.net writes:
In order to test this, I wrote a helper function to dump the rebase -i
todo list. Would you like this introduced in its own patch, or
combined? See below.
Depends on how
, or should I send it
as a whole new message with --in-reply-to? Or something else? I'll try
the first.
Andrew
---8---
From 99023bff23f18a341441d6b7c447d9630a11b489 Mon Sep 17 00:00:00 2001
From: Andrew Pimlott and...@pimlott.net
Date: Fri, 14 Jun 2013 10:33:16 -0700
Subject: [PATCH 1/4] rebase -i: handle
Excerpts from Junio C Hamano's message of Tue Jun 25 14:45:07 -0700 2013:
After all, autosquash will give the user an opportunity to eyeball
the result of automatic rearrangement. If the user did this:
git commit -m original
git commit --fixup original ;# obviously fixing the
Excerpts from Junio C Hamano's message of Tue Jun 25 14:33:18 -0700 2013:
Andrew Pimlott and...@pimlott.net writes:
Just reponding for the procedual part for now.
So if I don't want to break the discussion, should I append the unedited
format-patch output to my message after scissors
the user referred
to an earlier squash/fixup commit instead of the original commit, for
example with :/msg.
Signed-off-by: Andrew Pimlott and...@pimlott.net
---
builtin/commit.c | 18 ++
t/t7500-commit.sh | 36
2 files changed, 50 insertions
Excerpts from Thomas Rast's message of Tue Jun 11 11:50:07 -0700 2013:
Andrew Pimlott and...@pimlott.net writes:
git commit -m 'fix nasty bug'
...
git commit --fixup :/nasty
...
git commit --fixup :/nasty
The second :/nasty resolves to the previous fixup
git rebase -i --autosquash does not handle a fixup! of a fixup!, such as
the history:
aaa fix nasty bug
...
bbb fixup! fix nasty bug
...
ccc fixup! fixup! fix nasty bug
--autosquash produces:
pick aaa fix nasty bug
fixup bbb fixup! fix nasty bug
16 matches
Mail list logo
