Commit Briefs

dd3af45a9c Thomas Adam

add missing error checks in got_object_raw_open()






3ca3c94dcc Thomas Adam

rework murmurhash2() to avoid potential unaligned memory access

pointed out by naddy@ ok millert@



7d76c4e74f Thomas Adam

fix wrong function in error string of emitdelta()



40d16f06b4 Thomas Adam

sync dist file list


8528beeff9 Thomas Adam

do not skip ignored directories in 'got status' if they contain tracked files

Fixes regression introduced by commit 41f061b2f459318f3738f59d7676efccc4beb344 where tracked files inside an ignored directory were reported as missing.




f1417e9f1c Thomas Adam

sort and de-duplicate work tree path command line arguments

This is important in cases like 'got diff file.txt file.txt' which should only show the diff for file.txt once. suggested by kn@


b6c8e5e0ed Thomas Adam

fix a segfault in edscript() introduced by my previous commit

Found by our cherrypick regression tests.


461f6aedbd Thomas Adam

fix merging of files which contain a dot on a line by itself

Annoying bug which we inherited from OpenRCS which inherited it from OpenBSD's diff3 program. ok tracey millert


fd3a2fe6d4 Thomas Adam

speed up 'got histedit -l' and 'got rebase -l'

Cache commit timestamps in struct got_reference in case we are sorting references by commit timestamp. This avoids opening and closing commits every time we compare two references with each other. ok thomas.adam



cc8021afc2 Thomas Adam

implement 'got diff -c' for diffing commits with optional filtering by path

Need for filtering by path sugggested by kn@ ok naddy@


a3599220a6 Thomas Adam

display the requested object type when an object could not be found

ok millert@



f1165c794c Thomas Adam

make got_repo_match_object_id() filter tags by the requested object type

Potentially this function could return objects of a type that was not requested. Problem found by code inspection. This change does not affect any of our existing tests.


bea5ae7455 Thomas Adam

document "mg" as alias for the "merge" command


78c05fa484 Thomas Adam

Ignore tags files

OK stsp


fbbbc6078a Thomas Adam

portable: release 0.61 (tags/0.61)

Update configure.ac and CHANGELOG for 0.61