Commits

Commit:
62d463cac1fd99c423acb07c0367c649724a2a9a
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
indentation fixes
diff | patch | tree
Commit:
2513f20abd32eca0e2f74e92abd73629b4360258
From:
Stefan Sperling <stsp@stsp.name>
Date:
plug memory leaks in error paths; found by naddy
diff | patch | tree
Commit:
20a2ad1cd21c17764d7586038148381fb41adcb9
From:
Stefan Sperling <stsp@stsp.name>
Date:
use got_path_dirname() in schedule_for_deletion(); avoids const dirname(3) ok naddy
diff | patch | tree
Commit:
fddefe3be51f4f87aeffcb5b9c666a5b77672e5b
From:
Stefan Sperling <stsp@stsp.name>
Date:
use got_path_dirname() in remove_ondisk_file(); avoids const dirname(3) ok naddy
diff | patch | tree
Commit:
f5375317cb16274ce182ea5d99dd913de9b07390
From:
Stefan Sperling <stsp@stsp.name>
Date:
use got_path_dirname() in install_blob() to avoid const dirname(3) ok naddy
diff | patch | tree
Commit:
f4994adcb43b7e46b012a47d9a749f7c2625796e
From:
Stefan Sperling <stsp@stsp.name>
Date:
use got_path_dirname() in install_symlink() to avoid const dirname(3) ok naddy
diff | patch | tree
Commit:
ce031e9edbda06714eec1e83db6d05ea9230c1d2
From:
Stefan Sperling <stsp@stsp.name>
Date:
use got_path_dirname() in is_bad_symlink_target() ok naddy
diff | patch | tree
Commit:
ed6b5030fc87f1d187b18f724e18beb2212f6104
From:
Stefan Sperling <stsp@stsp.name>
Date:
use got_path_dirname() in merge_blob() instead of assuming const dirname(3) ok naddy
diff | patch | tree
Commit:
3524bbf95aa21318b6fff23c10b26ac57d1ab374
From:
Stefan Sperling <stsp@stsp.name>
Date:
make merge_file() use got_path_dirname() instead of assuming const dirname(3) ok naddy
diff | patch | tree
Commit:
aedea96d3489c0ed29af9550743889f6660adc35
From:
Stefan Sperling <stsp@stsp.name>
Date:
adapt got_open_worktree to non-const dirname(3) ok naddy
diff | patch | tree
Commit:
d34b633ebd3cc55febd0e0ec30d99459d7c3980e
From:
Stefan Sperling <stsp@stsp.name>
Date:
use got_path_basename() in match_deleted_or_modified_ct() ok millert
diff | patch | tree
Commit:
102b254e201b999cdeb0ef340dc6e08e4211376f
From:
Stefan Sperling <stsp@stsp.name>
Date:
switch to got_path_basename() in alloc_added_blob_tree_entry() ok millert
diff | patch | tree
Commit:
1233e6b6715afa716b042fc369d0becc3bb9f58f
From:
Stefan Sperling <stsp@stsp.name>
Date:
switch to got_path_basename in revert_file ok millert
diff | patch | tree
Commit:
4a26d3f877326c99bcf462b076800a112319ff6d
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix a bug where 'got status' showed an unchanged empty file as changed
diff | patch | tree
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
diff | patch | tree
Commit:
50b0790ed9a28fced631f31e5b7ca76a9a610ea5
From:
Stefan Sperling <stsp@stsp.name>
Date:
add per-worktree got.conf(5) file in the .got directory; ok millert
diff | patch | tree
Commit:
0823ffc2f6c509dbcedfb15d0d1011a253b45ef9
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
use modern POSIX timestamp fields in struct stat ok stsp
diff | patch | tree
Commit:
766841c2970cb5bef66c9c69201b231d0eefb120
From:
Stefan Sperling <stsp@stsp.name>
Date:
add -s option to 'got remove' which deletes files in a particular status This makes it easy to deal with files that were deleted from disk by external tooling which modified the work tree. Such files are left in missing (!) status and can now be marked for deletion in bulk via 'got rm -s\! -R .' For consistency, modified (M) files can now be removed with 'got rm -s M' which implies 'got rm -f'. Prompted by feedback from krw@
diff | patch | tree
Commit:
f2b0a8b0a1881cbc7388392deaa518caf38be151
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix committing file additions from a work tree with a path prefix New files were added under the wrong tree in the repository if the work tree has a path prefix. Fix this problem and catch it in the existing commit_with_path_prefix regression test.
diff | patch | tree
Commit:
69d57f3de25cfb3fd0cbfef22bd20090b36cee5e
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix spurious 'got cherrypick' error with a path prefix and an empty tree If the work tree's path prefix does not exist in the first of the two trees, then 'got cherrypick' failed with "no such entry found in tree". But this is a legitimate situation, as shown in the new test added here. The first tree could be the empty tree, for example, which should result in 'got cherrypick' adding all files from the second tree instead of complaining about a non-existent path-prefix directory in the first tree.
diff | patch | tree
Commit:
b66cd6f325e3fa7ddd17ff6dd41cf6e59d04ebf5
From:
Stefan Sperling <stsp@stsp.name>
Date:
display more context info in "no such entry found in tree" error messages
diff | patch | tree
Commit:
b2118c49a14c29447e228bf9a2b2a38f2da4f10b
From:
Stefan Sperling <stsp@stsp.name>
Date:
Add a 'got info' command which displays work tree meta-data. Remove the alias 'got in' for 'got init'. The 'in' alias was too close to either 'init' or 'info'. ok tracey, millert
diff | patch | tree
Commit:
283102fc7ecc50b874240654162793c0bd07a028
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove the symlink conflict header feature; it causes noise for little benefit
diff | patch | tree
Commit:
f9eec9d5cdd0cbb22e0d3ed2d1cb55569afafce9
From:
Stefan Sperling <stsp@stsp.name>
Date:
rename get_symlink_status() to get_symlink_modification_status() for clarity
diff | patch | tree
Commit:
f179e66de44d3541fbbcf6be9a5bcc70465f0bc9
From:
Stefan Sperling <stsp@stsp.name>
Date:
use a shortcut in get_file_status() for detecting symlinks appearing on disk
diff | patch | tree