Commits
- Commit:
69de9dd4215502c97f3e9b6c95cd1ce609fba278
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
limit checks for merge conflicts to files affected by the merge
Performance problems reported by naddy
- Commit:
5546d4669ccce281a6f6f89ccf204e671ed0d3a9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
plug a memory leak in check_merge_ok()
- Commit:
243a13f59c19fd9761211d200b68b77f99f6aded
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix bogus error when 'got cherrypick' merges changes into a locally added file
reported by + ok naddy
- Commit:
6c13b00592a6253b4a4de885b1f595e141b65281
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
Update comment regarding the merged_paths list used by rebase and histedit
with insight I obtained while trying to make this idea work, and failing...
- Commit:
dae2a678dfc5685c0f121fd205f62439f417dcc5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
backout 7280143edc2d689b1f57d5a46d376e48cdae64a2; not needed after all
- Commit:
0e33f8e0becf732ab33b3ce78c026790a651a5f9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
disable ignore lists during status walks used by rebase and histedit
Fixes rebase of gotwebd branch which added a new directory which is
also matched by .gitignore rules on the branch.
- Commit:
7280143edc2d689b1f57d5a46d376e48cdae64a2
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
refactor collect_commitables() to make it easier to call from elsewhere later
- Commit:
ff56836b1637f806bb308057ef9bd6d90b725568
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
Make 'got add' always require the -I option in order to add ignored files.
- Commit:
2c41dce749de6cee00ec5b611d0509f9e45f0fd7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
allow obstructed files skipped by 'got update' to be updated again
- Commit:
a769b60bb76783d3bc6637d75907b6ca5d623f40
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix a bug where files skipped by 'got update' could not be updated again
ok semarie@
- Commit:
dbdddfee1482b50ca8c4a0be06e4fec6a59fb9f4
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
switch from SIMPLEQ to equivalent STAILQ macros
The singly-linked tail queue macros were added to OpenBSD 6.9 and
are more widely available on other systems.
ok stsp
- Commit:
f6343036aa4d7e3805a44832b566b531271c1c6d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
new -I option for 'got status' to show files which match an ignore pattern
- 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