Commits

Commit:
f6343036aa4d7e3805a44832b566b531271c1c6d
From:
Stefan Sperling <stsp@stsp.name>
Date:
new -I option for 'got status' to show files which match an ignore pattern
diff | patch | tree
Commit:
1c4cdd89292391629861b9a13688e94879efe2ea
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix bogus 'permission denied' error when a file at work tree root is removed ok naddy
diff | patch | tree
Commit:
fdf3c2d3876d076bf098461a4d147227126588b4
From:
Stefan Sperling <stsp@stsp.name>
Date:
use Patience diff for merging during cherrypick/backout/histedit/rebase 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
Commit:
1d0f405485b02cc4480ea188879e4122e0ea32bd
From:
Stefan Sperling <stsp@stsp.name>
Date:
check for close(2) error in got_repo_close() and propagate errors up ok tracey
diff | patch | tree
Commit:
54d5be07768d1e312078b5eb60f0e32738a1631a
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix unrelated changes being merged by got cherrypick/backout/rebase/histedit This was a long-standing and very annoying bug. The two xfail tests in the cherrypick test suite are passing now.
diff | patch | tree
Commit:
1af628f4bfa50c224b392a774e72a213c97f6009
From:
Stefan Sperling <stsp@stsp.name>
Date:
switch merge_file_cb() to using merge_file() instead of merge_blob()
diff | patch | tree
Commit:
eec2f5a957bde0458cfa8ee022528e4aeabb708e
From:
Stefan Sperling <stsp@stsp.name>
Date:
decouple merge_file() parameters for 2nd derived version and merge target file
diff | patch | tree
Commit:
dc082d4a7ad5857602ab64aaea1f836ce47b689b
From:
Stefan Sperling <stsp@stsp.name>
Date:
in merge_file(), remove allocation of a base_path which is unused
diff | patch | tree
Commit:
07bb0f933a402d7387f7dd360060c55cdd1b56c0
From:
Stefan Sperling <stsp@stsp.name>
Date:
move merge_file()'s f_deriv parameter next to the f_orig parameter
diff | patch | tree
Commit:
db59069162efd1ccd4f236abe7d8eb3ca4b791e4
From:
Stefan Sperling <stsp@stsp.name>
Date:
make merge_file() accept FILEs instead of paths for orig and deriv inputs
diff | patch | tree
Commit:
67a666476ff7ffc6e95f7d9b994a8f7b01cb86e5
From:
Stefan Sperling <stsp@stsp.name>
Date:
refactor merge_file() such that it no longer requires a blob object parameter
diff | patch | tree
Commit:
c6e8a8268ec4f4240d51dcfd54d05c5370060747
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
0f58026f98fdad502497af6b7bb1e8778ee88b42
From:
Stefan Sperling <stsp@stsp.name>
Date:
add a missing STATUS_EXISTS notification in update_blob()
diff | patch | tree
Commit:
4cc1f028ad995562d5037a1c8c54a241956d9dbb
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix use of an uninitialized stat buffer during work tree status crawl found by naddy ok naddy jrick
diff | patch | tree
Commit:
e600f1246e15fff13251ba9d299d74a24ae579c2
From:
Stefan Sperling <stsp@stsp.name>
Date:
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