fix typo in configure's libcrypto check; patch by Evan Silberman

make ignore patterns work with 'got status' ok thomas.adam

portable: update .gitignore Add .orig to gitgnore.

explicitly set the default branch name after 'git init' in regress tests We need to do this because newer versions of Git support an arbitrary default branch name which can be set by users. We don't want tests to fail when this option is used. pointed out by Thomas Adam

pull in a type fix from the OpenBSD parse.y template Original commit message by deraadt: (unsigned) means (unsigned int) which on ptrdiff_t or size_t or other larger types really is a range reduction... Almost any cast to (unsigned) is a bug.

fix unsigned/signed char mismatch in parse.y

portable: compat: remove unused files Fix up a weird automerge where some files referenced are either not used any more or have already been included.

portable: fix READMEs Remove conflict markers in README, and add mailing-list link to both READMEs. Noticed by stsp

portable: initial Linux compilation This commit modifies the GoT main branch to be able to compile it under linux.

update a CAVEAT in got.1 now that 'got merge' exists

interrupt 'got histedit' upon missing/unversioned/not-deleted files

interrupt 'got rebase' upon missing/unversioned/not-deleted files

document all reasons why 'got merge' might be interrupted

make 'got merge' interrupt the merge upon undeleted and unversioned files

print additional stats about things that went wrong during a merge

fix 'got fetch' downloading too many objects in some cases Always announce all local references to the server when fetching changes. We used to do this only in mirror mode. In regular mode only refs/tags and refs/remotes/origin were announced, which could result in unnecessary downloads if relevant objects exist in refs/heads or elsewhere.

got_sha1_digest_to_str() writes to char * ok stsp

fix unsigned/signed char mismatch in parse.y ok stsp

match the unsigned char type used by the zlib interface ok stsp

show commit progress output when 'got merge -c' is used Otherwise no progress output is shown at all with this command. Commit progress output will also display any additional changes which resulted from conflict resolution. ok millert@

portable: tog: add back _XOPEN_SOURCE_EXTENDED As with OpenBSD, FreeBSD requires that _XOPEN_SOURCE_EXTENDED is defined before including <ncurses.h>, otherwise things break. On other systems (Linux), _XOPEN_SOURCE_EXTENDED is already defined, so leaving that declared unconditionally throws an error. Keep the definition, but only include it on !Linux systems. Issue reported by Christian "naddy" Weisgerber

gotadmin: fixed GOT_LIBEXECDIR path libexecdir should be used over bindir. Noticed by Christian "naddy" Weisgerber

enable gotadmin Add gotadmin to configure.ac, etc., so it can be built and installed. OK thomas.adam

implement 'got merge -n' which interrupts before creating a merge commit

make it possible to merge vendor branches with 'got merge'