Commit Briefs

08347b7357 Stefan Sperling

encode deltas in temporary files to avoid high memory usage

diff | patch | tree

c5c77d2960 Stefan Sperling

make got-build-regress.sh run tests a second time with GOT_TEST_PACK=1

diff | patch | tree

5df018ff07 Stefan Sperling

rework murmurhash2() to avoid potential unaligned memory access

pointed out by naddy@ ok millert@

diff | patch | tree

1d19226a8a Stefan Sperling

fix two more error strings in pack_create.c using the wrong function name

diff | patch | tree

2d467c6d02 Stefan Sperling

fix wrong function in error string of emitdelta()

diff | patch | tree

f8b19efda6 Stefan Sperling

use RB_TREE instead of STAILQ to manage packindex bloom filters; much faster

diff | patch | tree

fc75ac9d8c Stefan Sperling

sync dist file list

diff | patch | tree

8f2ca62d67 Stefan Sperling

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.

diff | patch | tree

b343c297c6 Stefan Sperling

use a bloom filter to avoid pointless pack index searches

diff | patch | tree

7a0b1068b1 Stefan Sperling

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

diff | patch | tree

10a623dfc2 Stefan Sperling

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@

diff | patch | tree

90de04bc7f Stefan Sperling

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

Found by our cherrypick regression tests.

diff | patch | tree

f10244c07f Stefan Sperling

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

diff | patch | tree

2c9e323b3e Stefan Sperling

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

diff | patch | tree

51ed7429ea Stefan Sperling

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

diff | patch | tree

67b631c9e0 Stefan Sperling

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

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

diff | patch | tree

138e4f4798 Stefan Sperling

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

ok millert@

diff | patch | tree

8f83a2643c Stefan Sperling

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

diff | patch | tree

237cfda12c Stefan Sperling

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.

diff | patch | tree

8cb8da5b6d Christian Weisgerber

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

diff | patch | tree

c1e86b1d5b Stefan Sperling

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

diff | patch | tree

09209b8a13 Stefan Sperling

add test for merge result when lines are inserted at the top of a file

Based on a patch by Omar Polo

diff | patch | tree

aaef19b43a Stefan Sperling

sync files from diff.git 346d4986568ffbcfdc53cce45dd8a468535a68f2

diff | patch | tree

e7ffb0b07b Stefan Sperling

add support for multiple path arguments to 'got diff'

positive feedback from Omar and kn ok kn

diff | patch | tree

f736d93a2d Stefan Sperling

link to the FastCDC paper from deltify.c; suggested by Ori some time ago

diff | patch | tree