# Re: working out where git-rebase is up to? 6 messages from 2010-02-22 to 2010-02-22. Participants: Marc Weber, Jon Seymour, Thomas Rast. Thread: https://gitlist.dev/t/22753 ## Jon Seymour, 2010-02-22 10:09 Subject: working out where git-rebase is up to? Message-ID: <2cfc40321002220209pe1942ecucb3716f60bf05d32@mail.gmail.com> URL: https://gitlist.dev/e/2cfc40321002220209pe1942ecucb3716f60bf05d32%40mail.gmail.com ``` Hi, For my funky "compensating rebases" I need to know where an automated rebase has stopped. In particular, I need to know the sha1 of the commit that caused the rebase to stop. No doubt rebase is tracking this info, but is there a supported way to discover it? jon. ``` ## Marc Weber, 2010-02-22 10:19 Subject: Re: working out where git-rebase is up to? Message-ID: <1266833879-sup-7619@nixos> URL: https://gitlist.dev/e/1266833879-sup-7619%40nixos In-Reply-To: <2cfc40321002220209pe1942ecucb3716f60bf05d32@mail.gmail.com> ``` > No doubt rebase is tracking this info, but is there a supported way to > discover it? I may be mistaken. But git-rebase basically applies patches on top of a branch. And the branch it's operating on is checked out. So can't you just do git rev-parse HEAD to find out? Also have a look at the output. git rebase tells you which patch it is applying. Marc Weber ``` ## Thomas Rast, 2010-02-22 10:26 Subject: Re: working out where git-rebase is up to? Message-ID: <201002221126.47372.trast@student.ethz.ch> URL: https://gitlist.dev/e/201002221126.47372.trast%40student.ethz.ch In-Reply-To: <2cfc40321002220209pe1942ecucb3716f60bf05d32@mail.gmail.com> ``` On Monday 22 February 2010 11:09:18 Jon Seymour wrote: > Hi, > > For my funky "compensating rebases" I need to know where an automated > rebase has stopped. In particular, I need to know the sha1 of the > commit that caused the rebase to stop. > > No doubt rebase is tracking this info, but is there a supported way to > discover it? It's in .git/rebase-merge/done (and .git/rebase-merge/git-rebase-todo for the remaining TODO file). Maybe we should add a 'git rebase --whydiditstop' command ;-) -- Thomas Rast trast@{inf,student}.ethz.ch ``` ## Jon Seymour, 2010-02-22 10:47 Subject: Re: working out where git-rebase is up to? Message-ID: <2cfc40321002220247q1b73ac32v6ff39035a61a6a1@mail.gmail.com> URL: https://gitlist.dev/e/2cfc40321002220247q1b73ac32v6ff39035a61a6a1%40mail.gmail.com In-Reply-To: <201002221126.47372.trast@student.ethz.ch> ``` Once I am done with my compensating rebase, rebase won't have to stop :-) jon. On Mon, Feb 22, 2010 at 9:26 PM, Thomas Rast wrote: > On Monday 22 February 2010 11:09:18 Jon Seymour wrote: >> Hi, >> >> For my funky "compensating rebases" I need to know where an automated >> rebase has stopped. In particular, I need to know the sha1 of the >> commit that caused the rebase to stop. >> >> No doubt rebase is tracking this info, but is there a supported way to >> discover it? > > It's in .git/rebase-merge/done (and .git/rebase-merge/git-rebase-todo > for the remaining TODO file).  Maybe we should add a 'git rebase > --whydiditstop' command ;-) > > -- > Thomas Rast > trast@{inf,student}.ethz.ch > ``` ## Thomas Rast, 2010-02-22 10:49 Subject: Re: working out where git-rebase is up to? Message-ID: <201002221149.32504.trast@student.ethz.ch> URL: https://gitlist.dev/e/201002221149.32504.trast%40student.ethz.ch In-Reply-To: <201002221126.47372.trast@student.ethz.ch> ``` On Monday 22 February 2010 11:26:47 Thomas Rast wrote: > On Monday 22 February 2010 11:09:18 Jon Seymour wrote: > > For my funky "compensating rebases" I need to know where an automated > > rebase has stopped. In particular, I need to know the sha1 of the > > commit that caused the rebase to stop. > > > > No doubt rebase is tracking this info, but is there a supported way to > > discover it? > > It's in .git/rebase-merge/done (and .git/rebase-merge/git-rebase-todo > for the remaining TODO file). Maybe we should add a 'git rebase > --whydiditstop' command ;-) Here's a lightly tested draft patch. I should stop stealing work time for this, but you're welcome to fill in docs and tests and submit it. diff --git i/git-rebase--interactive.sh w/git-rebase--interactive.sh index 415ae72..d34c057 100755 --- i/git-rebase--interactive.sh +++ w/git-rebase--interactive.sh @@ -13,7 +13,7 @@ OPTIONS_KEEPDASHDASH= OPTIONS_SPEC="\ git-rebase [-i] [options] [--] [] -git-rebase [-i] (--continue | --abort | --skip) +git-rebase [-i] (--continue | --abort | --skip | --status) -- Available options are v,verbose display a diffstat of what changed upstream @@ -26,6 +26,7 @@ i,interactive always used (no-op) continue continue rebasing process abort abort rebasing process and restore original branch skip skip current patch and continue rebasing process +status show where the rebasing process stopped no-verify override pre-rebase hook from stopping the operation root rebase all reachable commmits up to the root(s) autosquash move commits that begin with squash!/fixup! under -i @@ -103,6 +104,10 @@ AMEND="$DOTEST"/amend REWRITTEN_LIST="$DOTEST"/rewritten-list REWRITTEN_PENDING="$DOTEST"/rewritten-pending +# This file holds the status message that we showed to the user when +# stopping, so that it can be retrieved by 'git rebase --status'. +STATUS="$DOTEST"/status + PRESERVE_MERGES= STRATEGY= ONTO= @@ -204,11 +209,16 @@ make_patch () { get_author_ident_from_commit "$1" > "$AUTHOR_SCRIPT" } +status_message () { + cat >> "$STATUS" + "$1" "$(cat "$STATUS")" +} + die_with_patch () { echo "$1" > "$DOTEST"/stopped-sha make_patch "$1" git rerere - die "$2" + status_message die "$2" } die_abort () { @@ -429,8 +439,10 @@ die_failed_squash() { mv "$SQUASH_MSG" "$MSG" || exit rm -f "$FIXUP_MSG" cp "$MSG" "$GIT_DIR"/MERGE_MSG || exit - warn - warn "Could not apply $1... $2" + status_message warn < "$DOTEST"/stopped-sha make_patch $sha1 git rev-parse --verify HEAD > "$AMEND" - warn "Stopped at $sha1... $rest" - warn "You can amend the commit now, with" - warn - warn " git commit --amend" - warn - warn "Once you are satisfied with your changes, run" - warn - warn " git rebase --continue" - warn + status_message warn <&2 + exit + ;; -s) case "$#,$1" in *,*=*) -- Thomas Rast trast@{inf,student}.ethz.ch ``` ## Jon Seymour, 2010-02-22 10:51 Subject: Re: working out where git-rebase is up to? Message-ID: <2cfc40321002220251g7d7230a3g84753678f5d79d44@mail.gmail.com> URL: https://gitlist.dev/e/2cfc40321002220251g7d7230a3g84753678f5d79d44%40mail.gmail.com In-Reply-To: <201002221149.32504.trast@student.ethz.ch> ``` > Here's a lightly tested draft patch. I should stop stealing work time > for this, but you're welcome to fill in docs and tests and submit it. > Thanks! I'll give it a whirl. jon. ```