sync dist file list

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.

use a bloom filter to avoid pointless pack index searches

fix pack index cache element rotation; keep often used entries near the front

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@

fix a segfault in edscript() introduced by my previous commit Found by our cherrypick regression tests.

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

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

align 'diff -c' usage help with synopsis given in man page; suggested by naddy

implement 'got diff -c' for diffing commits with optional filtering by path Need for filtering by path sugggested by kn@ ok naddy@

display the requested object type when an object could not be found ok millert@

remove code which was setting up repo_path redundantly from cmd_diff()

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.

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

Ignore tags files OK stsp

portable: release 0.61 Update configure.ac and CHANGELOG for 0.61

gotadmin: include gotadmin.1 in dist When building the dist tarball, include its man page.

portable: remove extraneous strerror_r check On a __GLIBC__ system, we need to use __xpg_strerror_r() -- this is already checked for, so simply one of these checks to reduce code changes from upstream.

regress: provide a sed wrapper In order to portably handle the difference in how 'sed -i' works between *BSD and Linux, provide a wrapper to invoke the underying system sed(1) based on which OSTYPE is in use.

regress: use gdate/gln if on *BSD To minimise the amount of churn between the difference in date(1) and ln(n) semantics, use gdate and gln from coreutils.

regress: enable tests Enable the compilation and execution of the tests under regress/

portable: propagate AM_CFLAGS/AM_CPPFLAGS Allow for warnings via AM_CFLAGS in a common Makefile, and let those values propagate to all other Makefiles. Currently the more useful checks are disabled until upstream changes are made to reduce warnings. While here, also fix the version string to remove quotes.

add an xfail test for a bug in merging content with a dot on a line by itself

add test for merge result when lines are inserted at the top of a file Based on a patch by Omar Polo

sync files from diff.git 346d4986568ffbcfdc53cce45dd8a468535a68f2