Commits
- 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
- 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.
- Commit:
1d0f405485b02cc4480ea188879e4122e0ea32bd
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
check for close(2) error in got_repo_close() and propagate errors up
ok tracey
- 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.
- Commit:
1af628f4bfa50c224b392a774e72a213c97f6009
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
switch merge_file_cb() to using merge_file() instead of merge_blob()
- Commit:
eec2f5a957bde0458cfa8ee022528e4aeabb708e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
decouple merge_file() parameters for 2nd derived version and merge target file
- Commit:
dc082d4a7ad5857602ab64aaea1f836ce47b689b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
in merge_file(), remove allocation of a base_path which is unused
- Commit:
07bb0f933a402d7387f7dd360060c55cdd1b56c0
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move merge_file()'s f_deriv parameter next to the f_orig parameter
- Commit:
db59069162efd1ccd4f236abe7d8eb3ca4b791e4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make merge_file() accept FILEs instead of paths for orig and deriv inputs
- Commit:
67a666476ff7ffc6e95f7d9b994a8f7b01cb86e5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
refactor merge_file() such that it no longer requires a blob object parameter
- 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.
- Commit:
0f58026f98fdad502497af6b7bb1e8778ee88b42
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a missing STATUS_EXISTS notification in update_blob()
- 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
- 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
- Commit:
6e210706a4224007cf266b48c28e5a54e8279589
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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.
- Commit:
60e40e9508a5c419b43c5c0d32f9a3af81546463
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
close file handles before freeing other things in got_worktree_close()
The work tree's path needs to be valid while constructing error messages.
- Commit:
e7abd6b665c4cff5b07ed20382f14cc1b5775c5c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix missing close(2) error check in got_worktree_close()
- Commit:
08578a35f60be8657db97b705f27a55ab61850c8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make close(2) failure checks consistent; check 'close() == -1' everywhere
ok millert, naddy
- Commit:
56b63ca4ab1049de6fa2d6910ce22c16e2b42a53
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make fclose(3) failure checks consistent; check 'fclose() == EOF' everywhere
ok millert, naddy
- Commit:
a6b21eef0424b9af0a7d5dc6ade675b94dde3150
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add missing braces around multi-line if-statement in got_worktree_close()
- Commit:
a06ff56fe6d05906b4a5c515605b1196b3479d1f
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
fix a use after free()
ok jrick stsp
- Commit:
9bdd68dd5c8e79a94fa4a5a69064ba33acd0b27a
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
replace fparseln(3) with getline(3), for better portability
ok stsp
- Commit:
a615e0e7796ea1103a6e0d4b5dbb613459788666
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
implicitly mark all files in work tree as up-to-date after rebase/histedit
This should always be correct, since rebase and histedit start out with a
clean and single-base-commit worktree, and end up committing all changes
across the entire work tree when they are successful.
tested by jrick and myself
- Commit:
437adc9d5be73b4b89441362ec89de754374a5a6
- From:
- Yang Zhong <yzhong@freebsdfoundation.org>
- Date:
add fd field to got_worktree, modify got_fileindex_entry_update to use fds
These changes are intended to make got more compatible
with FreeBSD's Capsicum.
ok stsp
- Commit:
64453f7e55c4c69b6cd08229929ed8227b789ff8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle binary files in got/tog diff commands; add -a options to force text