Gotweb

Commits

Commit:: 24f136e0f955e179395f9d081b45fbea32f02325
From:: Stefan Sperling <stsp@stsp.name>
Via:: Thomas Adam <thomas@xteddy.org>
Date:: Sat Nov 20 22:47:47 2021 UTC

preverse binary files during updates and merges

diff | patch | tree

Commit:: 1ea7ccc6f361b1b07c3f3c301b033ea50b17cf54
From:: Stefan Sperling <stsp@stsp.name>
Via:: Thomas Adam <thomas@xteddy.org>
Date:: Mon Nov 15 17:07:41 2021 UTC

let gotadmin find the repository automatically if invoked in a work tree Move a small amount of code from worktree.c to a new file worktree_open.c, which contains everything required to open and close a work tree and inspect some of its basic parameters. This can be used by gotadmin. ok tracey

diff | patch | tree

Commit:: 6092c29954d72000fdc1b6fe2a9c10ff56aabc65
From:: Stefan Sperling <stsp@stsp.name>
Via:: Thomas Adam <thomas@xteddy.org>
Date:: Mon Oct 4 07:53:31 2021 UTC

skip ignored directories during 'got status' disk crawl

diff | patch | tree

Commit:: ae1e948a3179529896cf69272a0c1b45ab8ced1c
From:: Stefan Sperling <stsp@stsp.name>
Via:: Thomas Adam <thomas@xteddy.org>
Date:: Tue Sep 28 23:20:09 2021 UTC

show commit progress output when 'got merge -c' is used Otherwise no progress output is shown at all with this command. Commit progress output will also display any additional changes which resulted from conflict resolution. ok millert@

diff | patch | tree

Commit:: 3dc1dc04a5ecf97ba3ce3f8c103c73bcfe00e31e
From:: Stefan Sperling <stsp@stsp.name>
Via:: Thomas Adam <thomas@xteddy.org>
Date:: Mon Sep 27 06:40:44 2021 UTC

for portability, handle errno variations upon open(2) failure with O_NOFOLLOW Problem pointed out by naddy for FreeBSD -portable. Discussed with millert, thomas adam, and naddy.

diff | patch | tree

Commit:: ace90326f82adffc32a25213124922899e849771
From:: Stefan Sperling <stsp@stsp.name>
Via:: Thomas Adam <thomas@xteddy.org>
Date:: Mon Sep 27 06:40:44 2021 UTC

allow bad symlinks to survive a merge Commands which perform merges will now install bad symlinks as symlinks in the work tree, instead of creating them as regular files. This means bad symlinks committed with 'got commit -S' (or Git) will be preserved. The decision to introduce a bad symlink is done at commit-time and merges should not forcefully reverse this decision. The cherrypick and backout commands require a manual commit step, and a merge result with bad symlinks will require use of 'got commit -S'. Additional testing by thomas adam

diff | patch | tree

Commit:: 92a9e85d28a30997176ce0d3c2915e3ea70782c7
From:: Thomas Adam <thomas@xteddy.org>
Date:: Fri Sep 24 22:02:58 2021 UTC

portable: add FreeBSD support This adds the capability to compile got-portable on FreeBSD.

diff | patch | tree

Commit:: e6f4ba3109814ba43d3a9e9c9c9dc55c40149dbc
From:: Stefan Sperling <stsp@stsp.name>
Via:: Thomas Adam <thomas@xteddy.org>
Date:: Fri Sep 24 22:01:09 2021 UTC

fix 'got update' of an added + obstructed file When 'got update' tried to add a new file to the work tree and this file was obstructed by, say, a directory on disk, the update failed: $ got update ? new got: new: Is a directory $ And the work tree was not updated. With this commit this situation is properly detected as an obstruction and the update succeeds: $ got update ~ new Updated to refs/heads/master: c1f85b4938dc4c668a88f13df2b98a520fc077cc File paths obstructed by a non-regular file: 1 $ Extend a corresponding test case to cover this issue. ok tracey

diff | patch | tree

Commit:: dfe86d1fa6f81d3a709059eda591863efd8d5a34
From:: Stefan Sperling <stsp@stsp.name>
Via:: Thomas Adam <thomas@xteddy.org>
Date:: Fri Sep 24 22:01:09 2021 UTC

plug memory leak in got_worktree_merge_in_progress(); spotted by tracey

diff | patch | tree

Commit:: 10604dce6e625d11974fb5491598bbb54069e5d3
From:: Stefan Sperling <stsp@stsp.name>
Via:: Thomas Adam <thomas@xteddy.org>
Date:: Fri Sep 24 22:01:09 2021 UTC

add a 'got merge' command for creating merge commits Additional testing by Thomas Adam. ok tracey

diff | patch | tree

Commit:: dd038bc6ec835ad3fd3c0b5303b8af9ad506c8cc
From:: Thomas Adam <thomas@xteddy.org>
Via:: Thomas Adam <thomas.adam@smoothwall.net>
Date:: Tue Sep 21 20:34:22 2021 UTC

portable: initial Linux compilation This commit modifies the GoT main branch to be able to compile it under linux.

diff | patch | tree

Commit:: abc59930d57a2d46c310e1b0c758c948554bc1af
From:: Christian Weisgerber <naddy@mips.inka.de>
Date:: Sun Sep 5 19:41:03 2021 UTC

indentation fixes

diff | patch | tree

Commit:: 69de9dd4215502c97f3e9b6c95cd1ce609fba278
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Sep 3 09:02:06 2021 UTC

limit checks for merge conflicts to files affected by the merge Performance problems reported by naddy

diff | patch | tree

Commit:: 5546d4669ccce281a6f6f89ccf204e671ed0d3a9
From:: Stefan Sperling <stsp@stsp.name>
Date:: Thu Sep 2 19:39:14 2021 UTC

plug a memory leak in check_merge_ok()

diff | patch | tree

Commit:: 243a13f59c19fd9761211d200b68b77f99f6aded
From:: Stefan Sperling <stsp@stsp.name>
Date:: Thu Sep 2 19:13:50 2021 UTC

fix bogus error when 'got cherrypick' merges changes into a locally added file reported by + ok naddy

diff | patch | tree

Commit:: 6c13b00592a6253b4a4de885b1f595e141b65281
From:: Stefan Sperling <stsp@stsp.name>
Date:: Thu Sep 2 13:57:34 2021 UTC

Update comment regarding the merged_paths list used by rebase and histedit with insight I obtained while trying to make this idea work, and failing...

diff | patch | tree

Commit:: dae2a678dfc5685c0f121fd205f62439f417dcc5
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Sep 1 20:31:46 2021 UTC

backout 7280143edc2d689b1f57d5a46d376e48cdae64a2; not needed after all

diff | patch | tree

Commit:: 0e33f8e0becf732ab33b3ce78c026790a651a5f9
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Sep 1 14:34:33 2021 UTC

disable ignore lists during status walks used by rebase and histedit Fixes rebase of gotwebd branch which added a new directory which is also matched by .gitignore rules on the branch.

diff | patch | tree

Commit:: 7280143edc2d689b1f57d5a46d376e48cdae64a2
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Sep 1 11:56:31 2021 UTC

refactor collect_commitables() to make it easier to call from elsewhere later

diff | patch | tree

Commit:: ff56836b1637f806bb308057ef9bd6d90b725568
From:: Stefan Sperling <stsp@stsp.name>
Date:: Thu Jul 8 10:30:10 2021 UTC

Make 'got add' always require the -I option in order to add ignored files.

diff | patch | tree

Commit:: 2c41dce749de6cee00ec5b611d0509f9e45f0fd7
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Jun 27 15:30:08 2021 UTC

allow obstructed files skipped by 'got update' to be updated again

diff | patch | tree

Commit:: a769b60bb76783d3bc6637d75907b6ca5d623f40
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Jun 27 09:22:52 2021 UTC

fix a bug where files skipped by 'got update' could not be updated again ok semarie@

diff | patch | tree

Commit:: dbdddfee1482b50ca8c4a0be06e4fec6a59fb9f4
From:: Christian Weisgerber <naddy@mips.inka.de>
Date:: Wed Jun 23 20:48:35 2021 UTC

switch from SIMPLEQ to equivalent STAILQ macros The singly-linked tail queue macros were added to OpenBSD 6.9 and are more widely available on other systems. ok stsp

diff | patch | tree

Commit:: f6343036aa4d7e3805a44832b566b531271c1c6d
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Jun 22 20:00:44 2021 UTC

new -I option for 'got status' to show files which match an ignore pattern

diff | patch | tree

Commit:: 1c4cdd89292391629861b9a13688e94879efe2ea
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Jun 20 21:07:54 2021 UTC

fix bogus 'permission denied' error when a file at work tree root is removed ok naddy

diff | patch | tree