Commits
- 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
- Commit:
fe621944e83fe6367f7bff97128b4240a9cdc7c5- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
merge new diff implementation from the git.gameoftrees.org diff.git repository
This new diff implementation was started by Neels Hofmeyr during the u2k20
hackathon and now replaces diffreg.c code lifted from the OpenBSD base system.
The integration of this code into Got was done by me.
Got now uses the patience diff algorithm by default.
The diff.git repository will remain the primary repository for the diff code,
which already compiles and runs on other operating systems such as Linux.
Any fixes and improvements for files inherited from the diff.git repository
should be written against that repository and synced to got.git afterwards.
- Commit:
f6d8c0acbade4a4b9cc8a674270e689a800b1fb6- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix replacing symlinks with files
And add a test case which verifies that the inverse also works,
i.e. a symlink being replaced with a regular file.
problem reported and fix tested by jrick
- Commit:
63df146dfc84e000c931f34a3ec02b115fcebb49- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix missing unlink(tmppath) in error cases of install_blob()
- Commit:
2ac8aa022e2ae3e7792af5fe5a66e10b241a751f- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
clear staged file type in file index entries whenever staged status is cleared
- Commit:
727173c3ab3a0b386e808d2d6bbeacd048710216- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
initialize sb.st_mode after stat(2) failure in got_worktree_resolve_path()
- Commit:
017406073fd742cc052672dd2f2689838e76df3f- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
avoid got_repo_map_path() in 'got blame'
'got blame' does not need access to the work tree. So far the work tree
was completely hidden with unveil(). We must now expose the work tree
while resolving the path, so unveil() calls are shuffled around slightly.
Failing realpath() calls would mess with path resolution otherwise.
There's a bug in got_worktree_resolve_path() where it failed to canonicalize
a path constructed from a user-specified path that does not exist on disk.
Note that this path falls into strncmp() a few lines down. I am fixing this
by adding canonicalization. Generally, joining paths with asprintf() and
comparing paths with strncmp() is fragile. A more general solution might be
needed but I am leaving that for another day.
ok naddy
- Commit:
3818e3c42c1ac77dac0c571165dabfe2da05ff2b- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
convert all remaining instances of chmod(2) to fchmod(2)
ok stsp
- Commit:
62d463cac1fd99c423acb07c0367c649724a2a9a- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
indentation fixes
- Commit:
2513f20abd32eca0e2f74e92abd73629b4360258- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
plug memory leaks in error paths; found by naddy
- Commit:
20a2ad1cd21c17764d7586038148381fb41adcb9- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use got_path_dirname() in schedule_for_deletion(); avoids const dirname(3)
ok naddy
- Commit:
fddefe3be51f4f87aeffcb5b9c666a5b77672e5b- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use got_path_dirname() in remove_ondisk_file(); avoids const dirname(3)
ok naddy
- Commit:
f5375317cb16274ce182ea5d99dd913de9b07390- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use got_path_dirname() in install_blob() to avoid const dirname(3)
ok naddy
- Commit:
f4994adcb43b7e46b012a47d9a749f7c2625796e- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use got_path_dirname() in install_symlink() to avoid const dirname(3)
ok naddy
- Commit:
ce031e9edbda06714eec1e83db6d05ea9230c1d2- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use got_path_dirname() in is_bad_symlink_target()
ok naddy
- Commit:
ed6b5030fc87f1d187b18f724e18beb2212f6104- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use got_path_dirname() in merge_blob() instead of assuming const dirname(3)
ok naddy
- Commit:
3524bbf95aa21318b6fff23c10b26ac57d1ab374- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make merge_file() use got_path_dirname() instead of assuming const dirname(3)
ok naddy
- Commit:
aedea96d3489c0ed29af9550743889f6660adc35- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
adapt got_open_worktree to non-const dirname(3)
ok naddy
- Commit:
d34b633ebd3cc55febd0e0ec30d99459d7c3980e- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use got_path_basename() in match_deleted_or_modified_ct()
ok millert
- Commit:
102b254e201b999cdeb0ef340dc6e08e4211376f- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
switch to got_path_basename() in alloc_added_blob_tree_entry()
ok millert
- Commit:
1233e6b6715afa716b042fc369d0becc3bb9f58f- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
switch to got_path_basename in revert_file
ok millert
- Commit:
4a26d3f877326c99bcf462b076800a112319ff6d- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix a bug where 'got status' showed an unchanged empty file as changed
- Commit:
0a22ca1a5a1261bb7e230db211a205b68e1c3044- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got histedit' collapse folded add+delete operations into a no-op
If a merged commit wants to delete a locally added file, and this locally
added file matches the content which was deleted in the commit being merged,
we can go ahead with the deletion because there is no risk of data loss.
fixes the histedit problem reported by jrick on freenode
- Commit:
50b0790ed9a28fced631f31e5b7ca76a9a610ea5- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add per-worktree got.conf(5) file in the .got directory; ok millert