Gotweb

Commits

Commit:: 30f6c0c64b5c08d79e22cc2c0bd1f1340288a7f5
From:: Stefan Sperling <stsp@stsp.name>
Via:: Thomas Adam <thomas@xteddy.org>
Date:: Fri Oct 8 12:21:56 2021 UTC

add support for multiple path arguments to 'got diff' positive feedback from Omar and kn ok kn

diff | patch | tree

Commit:: d52bac284bc87b2e54ff8afd22886a7260f68b26
From:: Stefan Sperling <stsp@stsp.name>
Via:: Thomas Adam <thomas@xteddy.org>
Date:: Fri Oct 8 12:21:31 2021 UTC

ignore unversioned files while aborting rebase, histedit, merge or operations ok jrick

diff | patch | tree

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

add histedit -e option which runs the 'edit' script command for every commit ok jrick

diff | patch | tree

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

interrupt 'got histedit' upon missing/unversioned/not-deleted files

diff | patch | tree

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

interrupt 'got rebase' upon missing/unversioned/not-deleted files

diff | patch | tree

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

make 'got merge' interrupt the merge upon undeleted and unversioned files

diff | patch | tree

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

print additional stats about things that went wrong during a merge

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:: ba34626bc13877c93836c8ee873acf1be8429ead
From:: Stefan Sperling <stsp@stsp.name>
Via:: Thomas Adam <thomas@xteddy.org>
Date:: Mon Sep 27 18:32:16 2021 UTC

implement 'got merge -n' which interrupts before creating a merge commit

diff | patch | tree

Commit:: 768705e331a0ff020ecc806142aecdecdbfb2e89
From:: Stefan Sperling <stsp@stsp.name>
Via:: Thomas Adam <thomas@xteddy.org>
Date:: Mon Sep 27 18:32:16 2021 UTC

make it possible to merge vendor branches with 'got merge'

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:: 88d249c247d1925b032b3d0b1ce8cac6aa7d1a6d
From:: Stefan Sperling <stsp@stsp.name>
Via:: Thomas Adam <thomas@xteddy.org>
Date:: Fri Sep 24 22:01:09 2021 UTC

stop caring about obstructed versioned files in 'got merge' Tyring to write a test to cover this case I found that obstructed files are (correctly) detected as local modifications in the work tree. Thus they trigger the pre-condition check for local modications and 'got merge' will not even start to do any work in the presence of obstructed files.

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:: 4f3c844beaeb6a0b30565833e0481b8de9a5106e
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Sep 14 16:12:52 2021 UTC

make 'got update' display the worktree's branch name upon success ok tracey

diff | patch | tree

Commit:: 788d4a19ed0ddf9df069f9a6d5a8ecd9ebf932ee
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Sep 14 14:18:59 2021 UTC

validate status codes given to 'got status -S'

diff | patch | tree

Commit:: b043307bfaa7ea801d19677c0cdb5d4074c0c234
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Sep 14 14:15:49 2021 UTC

make got status -s and -S options conflict

diff | patch | tree

Commit:: 08e5873e99dff11184476ccc3186fbd2a97a2e0b
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Sep 14 14:05:27 2021 UTC

make 'got checkout' display the checked out reference and commit ID ok tracey

diff | patch | tree

Commit:: 00357e4dc78f7f5bd12eceaa07592ab743996e12
From:: Tracey Emery <tracey@traceyemery.net>
Date:: Tue Sep 14 13:49:46 2021 UTC

add suppress status-code selection to got status. this allows for a quick way to clean output without the use of ignore files. ok stsp

diff | patch | tree

Commit:: 4ad4a1ec452e58730b6d841ae6a044ff53827e15
From:: Tracey Emery <tracey@traceyemery.net>
Date:: Mon Sep 13 16:23:12 2021 UTC

add -q quiet mode to checkout and update. supressing output keeps the terminal responsive on large repos. ok jrick stsp

diff | patch | tree

Commit:: 1b796c3fa88f0d3101f3dd979d9f8b511fd93086
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sat Sep 11 08:06:47 2021 UTC

fix a null-pointer deref in 'got fetch -d'; reported by Omar Polo

diff | patch | tree

Commit:: 5e5da8c4bcc83f7737a115b8da52fc3935fe3a6b
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Sep 5 20:51:29 2021 UTC

rename got_fetch_parse_uri() to got_dial_parse_uri() This function is now being used by both 'got fetch' and 'got send' so its former name was misleading.

diff | patch | tree

Commit:: d65a88a2f0db40d2c2ac34ee34e8aff8ac629d52
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Sep 5 20:19:14 2021 UTC

move duplicated dial_ssh() and dial_git() functions into a common file These functions are used by 'got send' and 'got fetch' in order to open network connections to a server. Move them into new file lib/dial.c and declare relevant functions in got_dial.h and lib/got_lib_dial.h. No functional change.

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:: 978a28a108ecdc501cf03dade3215aed24981a12
From:: Christian Weisgerber <naddy@mips.inka.de>
Date:: Sat Sep 4 16:22:38 2021 UTC

make "got branch -d" print reference name and value Also silence output of "got branch -d" in a regression test, from stsp. ok stsp

diff | patch | tree

More ↓