Bug 235861 – [git-webkit] Autostash when pulling

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Ryosuke Niwa]

% ./Tools/Scripts/git-webkit up    
Downloading whichcraft-0.6.1...
Installing whichcraft-0.6.1...
Installed whichcraft-0.6.1!
error: cannot pull with rebase: You have unstaged changes.
error: additionally, your index contains uncommitted changes.
error: please commit or stash them.

% ./Tools/Scripts/git-webkit pull
error: cannot pull with rebase: You have unstaged changes.
error: additionally, your index contains uncommitted changes.
error: please commit or stash them.

This doesn't work. I need the ability to rebase against remote main without having to commit or stash local changes.

[Jonathan Bedard]

The implementation that first came to my mind would be controversial because it wouldn't work well from a branch, but turns out that `git pull` has an `--autostash` option, which should do what you're asking.

[Ryosuke Niwa]

(In reply to Jonathan Bedard from comment #1)
> The implementation that first came to my mind would be controversial because
> it wouldn't work well from a branch, but turns out that `git pull` has an
> `--autostash` option, which should do what you're asking.

oh, that's neat. so that'll stash, pull, then stash apply?

[Jonathan Bedard]

(In reply to Ryosuke Niwa from comment #2)
> (In reply to Jonathan Bedard from comment #1)
> > The implementation that first came to my mind would be controversial because
> > it wouldn't work well from a branch, but turns out that `git pull` has an
> > `--autostash` option, which should do what you're asking.
> 
> oh, that's neat. so that'll stash, pull, then stash apply?

Looks like it creates a temporary stash commit to be compatible with --rebase, but basically yes.

[Radar WebKit Bug Importer]

<rdar://problem/88298948>

[Jonathan Bedard]

Pull request: https://github.com/WebKit/WebKit/pull/113

[Jonathan Bedard]

Landed 246972@main (r289386)