Commit Briefs

ce15c8e29e Stefan Sperling

CHANGES for 0.68 (tags/0.68)



f2e1007bc5 Stefan Sperling

sync dist file list


1a4ff8fae8 Stefan Sperling

fix free() on uninitialized variable upon error in gw_output_file_blame()

ok op@



b3c57ab2fb Omar Polo

got patch: handle "\ No newline at end of file"





6863cbf965 Stefan Sperling

fix pack progress object counter for loose objects

Move pack progres object accounting to a single place. This makes it easier to account for the case were only loose objects are packed. A wrong amount of objects was reported before when packing loose ones.






7a30b5cb05 Omar Polo

got patch: prefer new name if not /dev/null and not a git-style diff

This fixes a common issue when for e.g. generating patches with $ diff -u foo.orig foo where 'got patch' failed because 'foo.orig' has an 'unexpected status'. prodded by naddy, ok stsp


f134ecfdc3 Christian Weisgerber

const-ify string table


78f5ac2436 Omar Polo

move got_patch file status checking in worktree.c

check_file_status used got_worktree_status to check if the file was in an allowed state, but it's wrong since the callback is not invoked on unchanged files. While here also fix a relate bug: unlink(newpath) is in the wrong spot and ends up removing files even when it shouldn't, so move it early in the got_worktree_schedule_* error handling. Finally, update the appropriate test case. It was passing before because got_worktree_schedule_add returned GOT_ERR_FILE_STATUS, not because check_file_status failed. ok stsp@


bfc73a473b Christian Weisgerber

explicitly include <unistd.h> for close(2)


70cc983209 Christian Weisgerber

move got_errors[] table into a single compilation unit (error.c)

ok stsp


39d5d1d2ed Tracey Emery

rm unused vars


d58ddaf3fc Christian Weisgerber

const-ify tables

ok thomas_adam millert


46ebad135d Omar Polo

style


60aa1fa0d1 Omar Polo

augment patch progress callback with hunks info; recover from errors

Augment got_patch_progress_cb by providing the hunks that were applied with offset (or that failed) and the recoverable error encountered during the operation (bad status, missing file, ...) got_patch now proceeds when a file fails to be patched and exits with GOT_ERR_PATCH_FAILED if no other errors are encountered. While here, also add a test for the 'hunk applied with offset' case and shrink test_patch_dont_apply and illegal_status by taking advantage that 'got patch' doesn't stop at the first error. (And add some other cases to illegal_status too.) discussed with and ok stsp@


95d683408a Omar Polo

got patch: create missing directories when adding files

ok stsp@


2be5e1a234 Omar Polo

got patch: keep permissions after patching a file

ok stsp@