mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 10:26:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

rebase -i: create .dotest-merge after validating options.

Browse Source 
Creating .dotest-merge before validating the options prevents both
--continue and --interactive from working if the options are invalid,
so only create it after validating the options.

[jc: however, just moving the creation of DOTEST breaks output]

Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matt Kraai 2007-09-25 18:30:13 -07:00 committed by Junio C Hamano
parent ae830ed7f5
commit 5166810b1e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git-rebase--interactive.sh
View File

@ -36,10 +36,9 @@ warn () {
output () {
case "$VERBOSE" in
'')
"$@" > "$DOTEST"/output 2>&1
output=$("$@" 2>&1 )
status=$?
test $status != 0 &&
cat "$DOTEST"/output
test $status != 0 && printf "%s\n" "$output"
return $status
;;
*)
@ -428,7 +427,6 @@ do
require_clean_work_tree
mkdir "$DOTEST" || die "Could not create temporary $DOTEST"
if test ! -z "$2"
then
output git show-ref --verify --quiet "refs/heads/$2" ||
@ -440,6 +438,8 @@ do
HEAD=$(git rev-parse --verify HEAD) || die "No HEAD?"
UPSTREAM=$(git rev-parse --verify "$1") || die "Invalid base"
mkdir "$DOTEST" || die "Could not create temporary $DOTEST"
test -z "$ONTO" && ONTO=$UPSTREAM
: > "$DOTEST"/interactive || die "Could not mark as interactive"