From: Eric Lesh <eclesh@ucla.edu>
To: Josef Sipek <jsipek@cs.sunysb.edu>
Cc: Git mailing list <git@vger.kernel.org>
Subject: [PATCH guilt] guilt-rebase: Make fast-forward work
Date: Sat, 28 Jul 2007 05:22:12 -0700 [thread overview]
Message-ID: <87d4ycen0r.fsf@hubert.paunchy.net> (raw)
Merges created with --no-commit and a blank commit message didn't update
the branch's HEAD in a fast-forward merge. Rebasing didn't actually do
anything in that case.
Also quote the log message when displaying the new HEAD.
Signed-off-by: Eric Lesh <eclesh@ucla.edu>
---
guilt-rebase | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/guilt-rebase b/guilt-rebase
index cc8dcf6..f7de813 100755
--- a/guilt-rebase
+++ b/guilt-rebase
@@ -49,11 +49,11 @@ cp "$applied" "$rebase_dir/status"
echo "First, poping all patches..."
pop_all_patches
-git-merge --no-commit "" HEAD $upstream > /dev/null 2> /dev/null
+git-merge --no-commit $upstream > /dev/null 2> /dev/null
echo ""
log=`git-log -1 --pretty=oneline`
-echo "HEAD is now at `echo $log | cut -c 1-7`... `echo $log | cut -c 41-`"
+echo "HEAD is now at `echo $log | cut -c 1-7`... `echo "$log" | cut -c 41-`"
#
# For each previously applied patch:
--
1.5.2
next reply other threads:[~2007-07-28 12:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-28 12:22 Eric Lesh [this message]
2007-07-28 20:40 ` [PATCH guilt] guilt-rebase: Make fast-forward work Josef Sipek
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=87d4ycen0r.fsf@hubert.paunchy.net \
--to=eclesh@ucla.edu \
--cc=git@vger.kernel.org \
--cc=jsipek@cs.sunysb.edu \
/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).