Revert "rebase: allow starting from a dirty tree."
This reverts commit 6c9ad166dbbf9e5a0c09450b892151dbec49b8dc. Allowing rebase to start in a dirty tree might have been a worthy goal, but it is not necessarily always wanted (some people prefer to be reminded that the state is dirty, and think about the next action that may not be to stash and proceed). Furthermore, depending on the nature of local changes, unstashing the dirty state on top of the rebased result is not always desirable. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Nov 1, 2007 at 13:46 UTC
0f49327c9755b6575b447f79b540749d231cb26d
1 file changed
+14
-58
git-rebase.sh
+14
-58
@@ -116,30 +116,10 @@ call_merge () {
116
}
117
118
finish_rb_merge () {
119
- if test -f "$dotest/stash"
120
- then
121
- stash=$(cat "$dotest/stash")
122
- git stash apply --index "$stash"
123
- fi
119
rm -r "$dotest"
120
echo "All done."
121
}
122
128
-read_stash () {
129
- if test -f "$1"
130
- then
131
- cat "$1"
132
- fi
133
-}
134
-unstash_and_exit () {
135
- err=$?
136
- if test -f "$1" && test $err = 0
137
- then
138
- git stash apply --index "$1"
139
- fi
140
- exit $err
141
-}
142
-
123
is_interactive () {
124
test -f "$dotest"/interactive ||
125
while case $#,"$1" in 0,|*,-i|*,--interactive) break ;; esac
@@ -174,9 +154,8 @@ do
154
finish_rb_merge
155
exit
156
fi
177
- stash=$(read_stash ".dotest/stash")
157
git am --resolved --3way --resolvemsg="$RESOLVEMSG"
179
- unstash_and_exit "$stash"
158
+ exit
159
;;
160
--skip)
161
if test -d "$dotest"
@@ -195,31 +174,21 @@ do
174
finish_rb_merge
175
exit
176
fi
198
- stash=$(read_stash ".dotest/stash")
177
git am -3 --skip --resolvemsg="$RESOLVEMSG"
200
- unstash_and_exit "$stash"
178
+ exit
179
;;
180
--abort)
181
git rerere clear
182
if test -d "$dotest"
183
then
206
- if test -f "$dotest/stash"
207
- then
208
- stash=$(cat "$dotest/stash")
209
- fi
184
rm -r "$dotest"
185
elif test -d .dotest
186
then
213
- if test -f ".dotest/stash"
214
- then
215
- stash=$(cat ".dotest/stash")
216
- fi
187
rm -r .dotest
188
else
189
die "No rebase in progress?"
190
fi
191
git reset --hard ORIG_HEAD
222
- test -z "$stash" || git stash apply --index "$stash"
192
exit
193
;;
194
--onto)
@@ -285,6 +254,16 @@ else
254
fi
255
fi
256
257
+# The tree must be really really clean.
258
+git update-index --refresh || exit
259
+diff=$(git diff-index --cached --name-status -r HEAD)
260
+case "$diff" in
261
+?*) echo "cannot rebase: your index is not up-to-date"
262
+ echo "$diff"
263
+ exit 1
264
+ ;;
265
+esac
266
+
267
# The upstream head must be given. Make sure it is valid.
268
upstream_name="$1"
269
upstream=`git rev-parse --verify "${upstream_name}^0"` ||
@@ -294,19 +273,11 @@ upstream=`git rev-parse --verify "${upstream_name}^0"` ||
273
onto_name=${newbase-"$upstream_name"}
274
onto=$(git rev-parse --verify "${onto_name}^0") || exit
275
297
-# The tree must be clean enough for us to create a stash
298
-stash=$(git stash create) || exit
299
-if test -n "$stash"
300
-then
301
- echo >&2 "Stashed away your working tree changes"
302
-fi
303
-
276
# If a hook exists, give it a chance to interrupt
277
if test -x "$GIT_DIR/hooks/pre-rebase"
278
then
279
"$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || {
280
echo >&2 "The pre-rebase hook refused to rebase."
309
- test -z "$stash" || git stash apply --index "$stash"
281
exit 1
282
}
283
fi
@@ -315,10 +286,7 @@ fi
286
case "$#" in
287
2)
288
branch_name="$2"
318
- git-checkout "$2" || {
319
- test -z "$stash" || git stash apply --index "$stash"
320
- usage
321
- }
289
+ git-checkout "$2" || usage
290
;;
291
*)
292
if branch_name=`git symbolic-ref -q HEAD`
@@ -341,7 +309,6 @@ if test "$upstream" = "$onto" && test "$mb" = "$onto" &&
309
! git rev-list --parents "$onto".."$branch" | grep " .* " > /dev/null
310
then
311
echo >&2 "Current branch $branch_name is up to date."
344
- test -z "$stash" || git stash apply --index "$stash"
312
exit 0
313
fi
314
@@ -361,7 +328,6 @@ git-reset --hard "$onto"
328
if test "$mb" = "$branch"
329
then
330
echo >&2 "Fast-forwarded $branch_name to $onto_name."
364
- test -z "$stash" || git stash apply --index "$stash"
331
exit 0
332
fi
333
@@ -369,16 +335,7 @@ if test -z "$do_merge"
335
then
336
git format-patch -k --stdout --full-index --ignore-if-in-upstream "$upstream"..ORIG_HEAD |
337
git am $git_am_opt --binary -3 -k --resolvemsg="$RESOLVEMSG"
372
- err=$?
373
-
374
- if test $err = 0
375
- then
376
- test -z "$stash" || git stash apply --index "$stash"
377
- exit
378
- else
379
- test -z "$stash" || echo "$stash" >.dotest/stash
380
- exit $err
381
- fi
338
+ exit $?
339
fi
340
341
# start doing a rebase with git-merge
@@ -389,7 +346,6 @@ echo "$onto" > "$dotest/onto"
346
echo "$onto_name" > "$dotest/onto_name"
347
prev_head=`git rev-parse HEAD^0`
348
echo "$prev_head" > "$dotest/prev_head"
392
-test -z "$stash" || echo "$stash" >"$dotest/stash"
349
350
msgnum=0
351
for cmt in `git rev-list --reverse --no-merges "$upstream"..ORIG_HEAD`