Commit Briefs
fix ignores when a path is passed to 'got status'
Problem reported by semarie, who also provided initial regression test code. ok semarie
replace the update_blob_fileindex_entry() helper function
This makes it easier to tell in which code paths we are expecting to handle a potential 'ie' NULL pointer and avoids a pointless search of the file index.
make 'got update' skip conflicted files
ok millert@
trim directories in got remove -R
This is a racy solution that needs to be properly implemented in the future. ok stsp
fix histedit 'rebase commit ID mismatch' error when splitting a commit
Commit IDs on histedit's temporary branch can change arbitrarily because the user may create new commits on this branch while editing past commits. So there is no point in trying to verify these IDs like we do during rebase. Add a test case which demonstrates the problem.
fix a bug where 'got revert -R' failed on added subtrees
The command could fail with "got: no such entry found in tree". This problem is reproduced by the regression test added in this commit. This happened because file index entries were processed in the wrong order by diff_fileindex_dir(). To fix this, keep removed entries in the RB tree and skip them when the file index is written out, rather than removing entries from the RB tree immediately causing side-effects for RB_NEXT and friends.
Sleep for one nanosecond after syncing the file index to disk
Ensures that files modified after got exits have a different timestamp from the one which was recorded in the file index. Previously, 'got status' did not always detect such files as modified. Problem reported by Steven McDonald.
add -E option to 'got checkout' allowing use of a non-empty work tree path
needed by and ok kn@
make 'got checkout' and 'got update' work with read-only repositories
but warn users about the garbage collection problem