Commit Briefs

15aed05334 Christian Weisgerber

add xfail test for histedit folding of delete followed by add

If a file is deleted, then in modified form added again, folding should restore the file with its new contents. ok stsp


885e96dfba Christian Weisgerber

regress: replace "sed -i" with ed(1) for portable in-place editing

"sed -i" is fundamentally unportable. GNU and OpenBSD sed(1) treat the extension for the backup file as an optional argument and use "sed -i" for no backup file. FreeBSD sed(1) treats the extension as an obligatory argument and uses "sed -i ''" for no backup file. There is no single syntax that works for both. ok stsp op


5799393091 Omar Polo

regress/commit.sh: tweak editor.sh for test_commit_prepared_logmsg

no need for sed (which doesn't change anything anyway), a no-op editor script is enough; the test ensures that the prepared log message is used. ok naddy@ stsp@


99a97f8092 Christian Weisgerber

regress: override locale settings

ok stsp


b43e02dae2 Omar Polo

don't pass -d to yacc

Patch from Josiah Frentsos, thanks!


88f6dccd4e Omar Polo

gotd: remove more (all?) double process names in log


4f8a120450 Omar Polo

gotd: Fix more double process names

Patch by Josiah Frentsos, thanks!


754c4343fe Omar Polo

template: sync usage() with man page

`-o' was missing. Patch from Josiah Frentsos, thank you!


1a4be2506a Thomas Adam

regress: make cmdline tests sh compatible

Ensure shell scripts can run under more POSIX-restricted shells. OK op@


f55db25a40 Christian Weisgerber

regress: replace unportable ln -h option with rm && ln

ok stsp


038b5b12dd Christian Weisgerber

guard MIN() macro against redefinition


3fa763e5f0 Stefan Sperling

gotd requires a config file; don't fail silently when gotd.conf cannot be read

Fixes an issue encountered by mlarkin@ where the auth process was working with an empty list of repositories and kept saying it could not find a repository which was obviously listed in gotd.conf. Now we can see errors from fopen() in the logs instead. Old code was copied from gotwebd where the config file is optional.


b54930d535 Omar Polo

add got_repo_get_object_format()

and use it to avoid hardcoding the digest type in a few places. ok stsp@


9334723a60 Christian Weisgerber

add xfail test for "got diff" when a commit changed a file to a directory

git diff: diff --git a/alpha b/alpha deleted file mode 100644 index 4a58007..0000000 --- a/alpha +++ /dev/null @@ -1 +0,0 @@ -alpha diff --git a/alpha/beta b/alpha/beta new file mode 100644 index 0000000..65b2df8 --- /dev/null +++ b/alpha/beta @@ -0,0 +1 @@ +beta got diff: diff d973bf45ce9b2b437b5d6352368e8406f9e256e2 34413d01304800f99058a1a42769e92afc534199 commit - d973bf45ce9b2b437b5d6352368e8406f9e256e2 commit + 34413d01304800f99058a1a42769e92afc534199


5c5396e5c1 Omar Polo

add missed `size' initialization for use with getline(3)

ok tb@



4fb2bb7d5b Stefan Sperling

make gotd repo_read store want/have commit IDs in ID sets rather than arrays

Currently only used to detect and avoid storing duplicate IDs sent in want and have lines by the client. If in the future we ever wanted to check which IDs the client has already sent us we could now do O(1) hash table lookups rather than iterating arrays. ok op@


6685e2e8b2 Stefan Sperling

Apply 'histedit -e' wording tweak from James Cook, thanks!


e96d39bf87 Omar Polo

histedit_parse_list: avoid needless free(line)

getline(3) allows to safely re-use the storage. While here rename `size' to `linesize', `len' to `linelen', and properly initialize `linesize' to zero; suggested by tb@ ok tb@


456d8970e1 Stefan Sperling

in got.1, clarify what users are expected to do during 'histedit -e'

Gap in the documentation pointed out by James Cook.


5a53ca9d31 Stefan Sperling

fall back to vi(1) instead of ed(1) if neither EDITOR nor VISUAL are set

ed users are reading files with their minds rather then their eyes, and might therefore be missing important visual clues we write into files before the user gets to edit them. Use of vi(1) ensures that such clues will not be missed.


47cb6f8b62 Omar Polo

fix GOT_IMSG_COMMIT_TRAVERSAL_REQUEST

The sending and receiving side are sending the data differently. It works now by chance since a struct got_object_id is "just" a SHA1_DIGEST_LENGTH sized buffer, but will break in the future. Furthermore, the structure of the data as described in got_lib_privsep.h is not respected, as the path_len field is not transmitted. Change it to send/receive a whole struct got_object_id, the path without the NUL and the proper length. (The path is also actually mandatory, so assert it too.) improvements + ok stsp@


d6baa0f6da Omar Polo

remove now unused sha1 handling from inflate and deflate

both were changed to use the new got_hash APIs.


c3b9af1846 Christian Weisgerber

add xfail test for "got update" replacing a file with a directory

ok stsp


1eb5d2a086 Christian Weisgerber

regress: git_rm will cd into the test repo by itself