@matheusbsbs / matheus-bagliano / commits / 6c9ad166db
Fork 0

rebase: allow starting from a dirty tree.

This uses the new "git stash create" interface to stash away the dirty state you have in your working tree before starting a rebase, and then replaying it when you are done with stashing. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Jul 9, 2007 at 00:51 UTC 6c9ad166dbbf9e5a0c09450b892151dbec49b8dc
1 file changed +58 -14
git-rebase.sh
+58 -14
@@ -116,10 +116,30 @@ 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
124 rm -r "$dotest"
125 echo "All done."
126 }
127
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 +
143 is_interactive () {
144 test -f "$dotest"/interactive ||
145 while case $#,"$1" in 0,|*,-i|*,--interactive) break ;; esac
@@ -154,8 +174,9 @@ do
174 finish_rb_merge
175 exit
176 fi
177 + stash=$(read_stash ".dotest/stash")
178 git am --resolved --3way --resolvemsg="$RESOLVEMSG"
158 - exit
179 + unstash_and_exit "$stash"
180 ;;
181 --skip)
182 if test -d "$dotest"
@@ -174,21 +195,31 @@ do
195 finish_rb_merge
196 exit
197 fi
198 + stash=$(read_stash ".dotest/stash")
199 git am -3 --skip --resolvemsg="$RESOLVEMSG"
178 - exit
200 + unstash_and_exit "$stash"
201 ;;
202 --abort)
203 git rerere clear
204 if test -d "$dotest"
205 then
206 + if test -f "$dotest/stash"
207 + then
208 + stash=$(cat "$dotest/stash")
209 + fi
210 rm -r "$dotest"
211 elif test -d .dotest
212 then
213 + if test -f ".dotest/stash"
214 + then
215 + stash=$(cat ".dotest/stash")
216 + fi
217 rm -r .dotest
218 else
219 die "No rebase in progress?"
220 fi
221 git reset --hard ORIG_HEAD
222 + test -z "$stash" || git stash apply --index "$stash"
223 exit
224 ;;
225 --onto)
@@ -254,16 +285,6 @@ else
285 fi
286 fi
287
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 -
288 # The upstream head must be given. Make sure it is valid.
289 upstream_name="$1"
290 upstream=`git rev-parse --verify "${upstream_name}^0"` ||
@@ -273,11 +294,19 @@ upstream=`git rev-parse --verify "${upstream_name}^0"` ||
294 onto_name=${newbase-"$upstream_name"}
295 onto=$(git rev-parse --verify "${onto_name}^0") || exit
296
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 +
304 # If a hook exists, give it a chance to interrupt
305 if test -x "$GIT_DIR/hooks/pre-rebase"
306 then
307 "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || {
308 echo >&2 "The pre-rebase hook refused to rebase."
309 + test -z "$stash" || git stash apply --index "$stash"
310 exit 1
311 }
312 fi
@@ -286,7 +315,10 @@ fi
315 case "$#" in
316 2)
317 branch_name="$2"
289 - git-checkout "$2" || usage
318 + git-checkout "$2" || {
319 + test -z "$stash" || git stash apply --index "$stash"
320 + usage
321 + }
322 ;;
323 *)
324 if branch_name=`git symbolic-ref -q HEAD`
@@ -309,6 +341,7 @@ if test "$upstream" = "$onto" && test "$mb" = "$onto" &&
341 ! git rev-list --parents "$onto".."$branch" | grep " .* " > /dev/null
342 then
343 echo >&2 "Current branch $branch_name is up to date."
344 + test -z "$stash" || git stash apply --index "$stash"
345 exit 0
346 fi
347
@@ -328,6 +361,7 @@ git-reset --hard "$onto"
361 if test "$mb" = "$branch"
362 then
363 echo >&2 "Fast-forwarded $branch_name to $onto_name."
364 + test -z "$stash" || git stash apply --index "$stash"
365 exit 0
366 fi
367
@@ -335,7 +369,16 @@ if test -z "$do_merge"
369 then
370 git format-patch -k --stdout --full-index --ignore-if-in-upstream "$upstream"..ORIG_HEAD |
371 git am $git_am_opt --binary -3 -k --resolvemsg="$RESOLVEMSG"
338 - exit $?
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
382 fi
383
384 # start doing a rebase with git-merge
@@ -346,6 +389,7 @@ echo "$onto" > "$dotest/onto"
389 echo "$onto_name" > "$dotest/onto_name"
390 prev_head=`git rev-parse HEAD^0`
391 echo "$prev_head" > "$dotest/prev_head"
392 +test -z "$stash" || echo "$stash" >"$dotest/stash"
393
394 msgnum=0
395 for cmt in `git rev-list --reverse --no-merges "$upstream"..ORIG_HEAD`