Bug 28436 - commit-queue/bugzilla-tool can get wedged if git is mid-rebase
Summary: commit-queue/bugzilla-tool can get wedged if git is mid-rebase
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC OS X 10.5
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks: 28445
  Show dependency treegraph
 
Reported: 2009-08-18 14:19 PDT by Eric Seidel (no email)
Modified: 2009-08-19 18:58 PDT (History)
1 user (show)

See Also:


Attachments
Testing this local change for now (685 bytes, patch)
2009-08-18 14:39 PDT, Eric Seidel (no email)
no flags Details | Formatted Diff | Diff
Patch v1 (6.11 KB, patch)
2009-08-19 17:25 PDT, Eric Seidel (no email)
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Eric Seidel (no email) 2009-08-18 14:19:57 PDT
commit-queue/bugzilla-tool can get wedged if git is mid-rebase

--force-clean should also do a git rebase --abort it seems.

It seems that I cannot create a rebase-apply directory, and
I wonder if you are in the middle of patch application or another
rebase.  If that is not the case, please
	rm -fr /Users/eseidel/Projects/WebKit2/.git/rebase-apply
and run me again.  I am stopping in case you still have something
valuable there.
rebase refs/remotes/trunk: command returned error: 1
Comment 1 Adam Barth 2009-08-18 14:25:01 PDT
I like how git talks in the first person.
Comment 2 Eric Seidel (no email) 2009-08-18 14:39:52 PDT
Created attachment 35079 [details]
Testing this local change for now
Comment 3 Adam Barth 2009-08-18 14:42:55 PDT
git rebase --abort isn't better here?  rm -rf is scary.
Comment 4 Eric Seidel (no email) 2009-08-18 14:46:34 PDT
I could use "git rebase --abort".  But it prints "No rebase in progress?" and exits "1" if there is no rebase in progress.  There doesn't seem to be a way to detect if a rebase is in progress.  I guess I could check for the existance of that file.  Not sure yet.
Comment 5 Eric Seidel (no email) 2009-08-19 17:25:50 PDT
Created attachment 35163 [details]
Patch v1
Comment 6 Adam Barth 2009-08-19 18:35:06 PDT
Comment on attachment 35163 [details]
Patch v1

Looks good.  Too bad there isn't a better way to tell if a rebase is in progress.
Comment 7 Eric Seidel (no email) 2009-08-19 18:41:31 PDT
Comment on attachment 35163 [details]
Patch v1

You should always feel free to mark my patches cq+.  I'll mark them cq- if needed.
Comment 8 Adam Barth 2009-08-19 18:46:03 PDT
I was worried about the improper ChangeLog diff, but maybe you've fixed that bug.
Comment 9 Eric Seidel (no email) 2009-08-19 18:47:33 PDT
Ah.  Well, I guess we'll see..  I think if anything it will get rejected.  svn-apply should be smart enough I think.
Comment 10 Eric Seidel (no email) 2009-08-19 18:58:26 PDT
Comment on attachment 35163 [details]
Patch v1

Clearing flags on attachment: 35163

Committed r47540: <http://trac.webkit.org/changeset/47540>
Comment 11 Eric Seidel (no email) 2009-08-19 18:58:33 PDT
All reviewed patches have been landed.  Closing bug.