Got Mirror

This has been shown to prevent mis-merges in some cases. It's probably not a final solution. We should look at what Git's "recursive merge" is doing and implement something similar. Keep using Myers during update/unstage. The advantage of Myers is that it produces smaller conflict chunks, and there are no known cases of mis-merges which affect update/unstage.

diff | patch | tree

3 years ago 1d0f405485 Stefan Sperling

check for close(2) error in got_repo_close() and propagate errors up

ok tracey

diff | patch | tree

3 years ago 54d5be0776 Stefan Sperling

This was a long-standing and very annoying bug. The two xfail tests in the cherrypick test suite are passing now.

diff | patch | tree

3 years ago 1af628f4bf Stefan Sperling

switch merge_file_cb() to using merge_file() instead of merge_blob()

diff | patch | tree

3 years ago eec2f5a957 Stefan Sperling

decouple merge_file() parameters for 2nd derived version and merge target file

diff | patch | tree

3 years ago dc082d4a7a Stefan Sperling

in merge_file(), remove allocation of a base_path which is unused

diff | patch | tree

3 years ago 07bb0f933a Stefan Sperling

move merge_file()'s f_deriv parameter next to the f_orig parameter

diff | patch | tree

3 years ago db59069162 Stefan Sperling

make merge_file() accept FILEs instead of paths for orig and deriv inputs

diff | patch | tree

3 years ago 67a666476f Stefan Sperling

refactor merge_file() such that it no longer requires a blob object parameter

diff | patch | tree

3 years ago c6e8a8268e Stefan Sperling

do not update symlinks which are already up-to-date

This fixes spurious 'U' notifications for symlinks during 'got update' that occurred even when the work tree was fully up-to-date. Observed on a work tree of the FreeBSD src repo and reproduced in our test suite by adding a no-op update at the end of a test which deals with updating symlinks.

diff | patch | tree

3 years ago 0f58026f98 Stefan Sperling

add a missing STATUS_EXISTS notification in update_blob()

diff | patch | tree

3 years ago 4cc1f028ad Stefan Sperling

fix use of an uninitialized stat buffer during work tree status crawl

found by naddy ok naddy jrick

diff | patch | tree

3 years ago e600f1246e Stefan Sperling

ensure that old commits remain referenced after rebase and histedit

Create automatic "backup" references which ensure that objects from the pre-rebase or pre-histedit state remain in the repository. A new -l option for 'got rebase' and 'got histedit' lists old commits. This makes it easier to recover from botched rebase or histedit operations. Removal of such objects currently requires got ref -d and git-gc. This will be made more convenient in the future. testing and ok jrick

diff | patch | tree

3 years ago 6e210706a4 Stefan Sperling

implicitly mark all files in work tree as up-to-date after 'got integrate'

Avoids having to run 'got update' for no good reason after 'got integrate'. The same change was made recently for both rebase and histedit in commit a615e0e7796ea1103a6e0d4b5dbb6134597886660 and we forgot about histedit.

diff | patch | tree

3 years ago 60e40e9508 Stefan Sperling

close file handles before freeing other things in got_worktree_close()

The work tree's path needs to be valid while constructing error messages.

diff | patch | tree

3 years ago e7abd6b665 Stefan Sperling

fix missing close(2) error check in got_worktree_close()

diff | patch | tree

3 years ago 08578a35f6 Stefan Sperling

make close(2) failure checks consistent; check 'close() == -1' everywhere

ok millert, naddy

diff | patch | tree