Page MenuHomePhabricator

Handles an issue in windows with large code bases not squash merging correctly.
ClosedPublic

Authored by hach-que on Apr 9 2014, 1:49 AM.

Details

Summary

Handles an issue in windows with large code bases not squash merging correctly, this only catches the issue it doesn't really do any recovery.

Test Plan

We have been running this change in our work environment, it's a hard bug to replicate but when it has reared it's head this has caught it.

Diff Detail

Repository
rARC Arcanist
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

waynea retitled this revision from to Handles an issue in windows with large code bases not squahs merging correctly..
waynea updated this object.
waynea edited the test plan for this revision. (Show Details)
waynea added a reviewer: epriestley.
waynea added a subscriber: hach-que.
epriestley edited edge metadata.

I guess I can accept this if you wrap it in a phutil_is_windows() call, but it would be nice to understand what's happening here, since it sounds like there's a fairly severe bug in Git if it's exiting with a dirty working copy.

This revision now requires changes to proceed.Apr 24 2014, 2:38 PM
hach-que added a reviewer: waynea.
hach-que edited edge metadata.
  • Update based on feedback
hach-que edited edge metadata.

Vim decided to change spaces into tabs :(

epriestley edited edge metadata.
This revision is now accepted and ready to land.May 20 2014, 11:41 PM

This prevents reverts

Should this be "this prevents commits"? Or is this actually specific to reverts?

It's a scenario where the squashed commit actually reverts all of the previous changes other people have made.

hach-que retitled this revision from Handles an issue in windows with large code bases not squahs merging correctly. to Handles an issue in windows with large code bases not squash merging correctly..May 21 2014, 12:04 AM
hach-que updated this object.
hach-que edited edge metadata.
hach-que updated this revision to Diff 21923.

Closed by commit rARC6b8552291dcc (authored by @hach-que).