Commit Briefs



2ed050c519 Omar Polo

`got patch' pledge early

ok stsp@


595228385f Omar Polo

got patch: error if patchfile isn't a regular file

`got patch' cannot read patches from non-regular files for obvious reasons. However, it could crash in sendmsg because pledge doesn't allow to send file descriptors referring to directories. So, restrict `got patch' to operate on regular files only and fail otherwise. This still allows to read patches from symlinks since they're resolved at open(2) time and the file type check is performed after. There may be a marginal usefullness in reading patches from fifos, but the current code doesn't allow that anyway since got-read-patch needs a seekable file descriptor anyway. ok tracey@


04aed1557b Christian Weisgerber

fix off_t type mismatches

off_t is a signed type and depending on the platform, it can be "long" or "long long", so cast to long long for printf(). ok stsp


10a16316a0 Omar Polo

tweak cmd_info; no functional changes intended

* don't allocate unused pack_fds * drop wpath, cpath, proc, exec and sendfd pledge promises * close the worktree ok stsp@


1004841d7c Omar Polo

don't undef GOT_AUTHOR in regress

unset only in the subshell so further cose is unaffected. ok stsp@


7370f8029c Omar Polo

use GOT_IGNORE_GITCONFIG in regress

fixes test_rebase_no_author_info when a valid ~/.gitconfig is found. ok stsp@


4fa16b393a Omar Polo

read_gitconfig: fix GOT_IGNORE_GITCONFIG case

set gitconfig_remotes to NULL to avoid a double-free, and reset the global author name/email fields too. ok stsp@


136e2bd4b6 Mark Jamsek

tog: refactor key map -> new view initialisation

Deduplicate view initialisation boilerplate and simplify new key map view requests with dispatch routine. Includes improvements suggested by stsp. ok stsp@


3e0f95fc70 Stefan Sperling

add a way to ignore author and remote repository info found in Git config files

ok op@


2c8899b952 Omar Polo

drop (needless?) sleep(1) in status.sh

ok stsp


38d61ead4d Omar Polo

fix `got patch -R' when using diff3 merge

`got patch -R' fails spectacularly when applied on a diff that contains the info of the original blob for the diff3 merge machinery since it tries to apply the reverse of the patch to the old blob. change it to run the patch (_not_ reversed) on the old blob and then swap the arguments to got_diff3_merge which gives us the correct reverse merge of the diff. while here add a test case too. reported by naddy, discussed with and ok stsp@





50e7a649ac Stefan Sperling

do not require local author info during 'got rebase'

My commit to reset committer info during rebase was too strict in some use cases. Even when simply forwarding a branch the rebase operation could now fail if GOT_AUTHOR is not set. To fix this, fall back on existing commiter information if no author is configured. And try to obtain author info from Git config in case GOT_AUTHOR is not set. Problems reported by Mikhail.


0f91044a8e Stefan Sperling

fix name clash in gotwebd

Rename GOT_PACK_NUM_TEMPFILES in gotwebd, since it clashes with a name already used in lib/repository.c. ok tracey


5e98fb339b Mark Jamsek

tog: uppercase alpha key maps that open new views

ok stsp@


01a7bcaf15 Mark Jamsek

tog: reset view->offset when clearing log view state

Don't move the selection cursor due to a bogus offset after closing child views following use of 'B', C-l, and backspace log view key maps. ok stsp@


6fe51fee00 Mark Jamsek

tog: use view->resize idiom to ensure log is populated

Replace view->mode == TOG_VIEW_LOG checks for requesting commits to populate the log view with calls to view->resize(). ok stsp@


598eac4331 Stefan Sperling

reset committer during rebase and histedit

ok op@


f8399b8f3e Stefan Sperling

call time(3) just once in commit_worktree(), not twice


dff918251f Mark Jamsek

tog: populate new child view log lines when switching split

When switching a child log view from a h- to a v-split, new log lines are empty. Rather than (mis)trace height and (not) call request_log_commits(), let resize_log_view() do the math and request commits if needed to draw new lines. ok op@