X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=git-rebase--common.sh;h=f00e13e5d04df09558dba65afd4fe1ed44375fa9;hb=a603d9406e6b4e8087b44a1b3c988b5f007ea770;hp=7e39d228717899228dfd735b22196de973e7add3;hpb=74ae0652c4736629db9c97f7a3ac7cebedaeae10;p=thirdparty%2Fgit.git

diff --git a/git-rebase--common.sh b/git-rebase--common.sh
index 7e39d22871..f00e13e5d0 100644
--- a/git-rebase--common.sh
+++ b/git-rebase--common.sh
@@ -10,7 +10,7 @@ write_basic_state () {
 	echo "$head_name" > "$state_dir"/head-name &&
 	echo "$onto" > "$state_dir"/onto &&
 	echo "$orig_head" > "$state_dir"/orig-head &&
-	echo "$GIT_QUIET" > "$state_dir"/quiet &&
+	test t = "$GIT_QUIET" && : > "$state_dir"/quiet
 	test t = "$verbose" && : > "$state_dir"/verbose
 	test -n "$strategy" && echo "$strategy" > "$state_dir"/strategy
 	test -n "$strategy_opts" && echo "$strategy_opts" > \
@@ -19,6 +19,7 @@ write_basic_state () {
 		"$state_dir"/allow_rerere_autoupdate
 	test -n "$gpg_sign_opt" && echo "$gpg_sign_opt" > "$state_dir"/gpg_sign_opt
 	test -n "$signoff" && echo "$signoff" >"$state_dir"/signoff
+	test -n "$reschedule_failed_exec" && : > "$state_dir"/reschedule-failed-exec
 }
 
 apply_autostash () {