From: Robert Shearman Date: Fri, 11 Jul 2008 21:26:59 GMT Subject: [PATCH] git-rebase.sh: Display error output from git-checkout when detaching HEAD fails. Message-ID: <1215811619-28512-1-git-send-email-robertshearman@gmail.com> The "git checkout" command executed could fail if, for example, upstream contains a file that would overrwrite a local, untracked file. The output redirection didn't work as stderr was redirected to /dev/null, as was stdout. This appears to be not what was intended so the order of redirections is fixed so that stderr is redirected to stdout instead. --- git-rebase.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index e2d85ee..0da2210 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -376,7 +376,7 @@ fi # Detach HEAD and reset the tree echo "First, rewinding head to replay your work on top of it..." -git checkout "$onto^0" >/dev/null 2>&1 || +git checkout "$onto^0" 2>&1 >/dev/null || die "could not detach HEAD" # git reset --hard "$onto^0" -- 1.5.6.2.225.g4596.dirty