[PATCH guilt] guilt-rebase: Make fast-forward work
- From
- Eric Lesh <eclesh@ucla.edu>
- Date
- Jul 28, 2007, 12:22 UTC
- Message-ID
- <87d4ycen0r.fsf@hubert.paunchy.net>
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