git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alex Riesen <raa.lkml@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Junio C Hamano <junkio@cox.net>
Subject: [PATCH] Fix rebase interactive to allow specifying branch to rebase along with the base
Date: Thu, 2 Aug 2007 00:32:41 +0200	[thread overview]
Message-ID: <20070801223241.GB2911@steel.home> (raw)
In-Reply-To: <20070801214556.GA2911@steel.home>

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
 git-rebase--interactive.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Alex Riesen, Wed, Aug 01, 2007 23:45:56 +0200:
>     $ git rebase -i base branch
>     /usr/local/bin/git-rebase--interactive: 482: cannot create /home/user/projects/tmp/.git/.dotest-merge/output: Directory nonexistent
>     cat: /home/user/projects/tmp/.git/.dotest-merge/output: No such file or directory
>     Invalid branchname: branch

Oh... Sometimes I can *very* slow. I believe it is as simple as that

 git-rebase--interactive.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 061cd0a..b42dee8 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -404,6 +404,7 @@ do
 		esac
 
 		require_clean_work_tree
+		mkdir "$DOTEST" || die "Could not create temporary $DOTEST"
 
 		if test ! -z "$2"
 		then
@@ -418,7 +419,6 @@ do
 
 		test -z "$ONTO" && ONTO=$UPSTREAM
 
-		mkdir "$DOTEST" || die "Could not create temporary $DOTEST"
 		: > "$DOTEST"/interactive || die "Could not mark as interactive"
 		git symbolic-ref HEAD > "$DOTEST"/head-name ||
 			die "Could not get HEAD"
-- 
1.5.3.rc3.123.ge9877

  parent reply	other threads:[~2007-08-01 22:32 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-08  2:01 [PATCH 1/3] rebase -i: handle --continue more like non-interactive rebase Johannes Schindelin
2007-07-08  4:40 ` Johannes Schindelin
2007-07-12 22:26 ` Alex Riesen
2007-08-01 15:57   ` Johannes Schindelin
2007-08-01 21:45     ` Alex Riesen
2007-08-01 22:31       ` [PATCH] rebase -i: fix for optional [branch] parameter Johannes Schindelin
2007-08-01 22:32       ` Alex Riesen [this message]
2007-08-01 22:36         ` [PATCH] Fix rebase interactive to allow specifying branch to rebase along with the base Johannes Schindelin
2007-08-01 22:40           ` Alex Riesen

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=20070801223241.GB2911@steel.home \
    --to=raa.lkml@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /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).