Commits


fix double-free when quitting tog's diff view; found by ofree at /home/stsp/src/got/tog/tog.c:3415 3415 free(s->line_offsets); (gdb) bt msg=0x80e2a4cd87e "chunk is already free %p") at /usr/src/lib/libc/stdlib/malloc.c:300 check=1) at /usr/src/lib/libc/stdlib/malloc.c:1070 clear=0, check=<optimized out>, argsz=0) at /usr/src/lib/libc/stdlib/malloc.c:1431 at /usr/src/lib/libc/stdlib/malloc.c:1488 at /home/stsp/src/got/tog/tog.c:3415 at /home/stsp/src/got/tog/tog.c:518 at /home/stsp/src/got/tog/tog.c:954 at /home/stsp/src/got/tog/tog.c:2728 at /home/stsp/src/got/tog/tog.c:5683 (gdb)


fix some memory leaks in tog


In got-worktree(5), explain how to re-create a corrupt or missing file index.


add a -q option to tests for quiet output and use it for 'make regress' Previous default output remains when test cases are run individually. ok tracey


remove remnants of recursive include support from parse.y


clean up those one-liner assignments ok stsp


got parse.y tweaks Rename things to better match their intended purpose. Tweak namespacing. Add a function for freeing config items that are dynamically allocated. Add 'struct gotconfig' to make room for potential global settings we might want to add later, instead of implementing just a list of remote repositories. ok tracey


bump version number


CHANGES for 0.38


make 'got log' -R and -P options work in combination With -R, the -P option did not show any paths. Regression test added here demonstrates the problem.


Fix missing block grouping. ok tracey stsp


use a more precise regex for color-highlighting 'commit' lines in 'tog log'


fix committing file additions from a work tree with a path prefix New files were added under the wrong tree in the repository if the work tree has a path prefix. Fix this problem and catch it in the existing commit_with_path_prefix regression test.


fix spurious 'got cherrypick' error with a path prefix and an empty tree If the work tree's path prefix does not exist in the first of the two trees, then 'got cherrypick' failed with "no such entry found in tree". But this is a legitimate situation, as shown in the new test added here. The first tree could be the empty tree, for example, which should result in 'got cherrypick' adding all files from the second tree instead of complaining about a non-existent path-prefix directory in the first tree.


display more context info in "no such entry found in tree" error messages


plug some parse.y leaks


Add a 'got info' command which displays work tree meta-data. Remove the alias 'got in' for 'got init'. The 'in' alias was too close to either 'init' or 'info'. ok tracey, millert


improve "got log ." command mark-up in got.1 EXAMPLES


fix use of uninitialized variable in got_fileindex_entry_update()


tweak description of new -S option for 'got commit' and 'got stage' with input from + ok tracy and millert


errant tab found by tracey


fix missing 'return 1' in commit.sh test failure cases


remove the symlink conflict header feature; it causes noise for little benefit


rename get_symlink_status() to get_symlink_modification_status() for clarity


use a shortcut in get_file_status() for detecting symlinks appearing on disk