Commits
- Commit:
768705e331a0ff020ecc806142aecdecdbfb2e89
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make it possible to merge vendor branches with 'got merge'
- Commit:
2f4dd2c2551a389a9e13498a806657a921679554
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portability: fix typos
Fix some typos.
From Christian "naddy" Weisgerber
- Commit:
3dc1dc04a5ecf97ba3ce3f8c103c73bcfe00e31e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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.
- Commit:
ace90326f82adffc32a25213124922899e849771
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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
- Commit:
e8256d916369996c214b5f28673d32f910996708
- From:
- Thomas Adam <thomas.adam@smoothwall.net>
- Date:
Github: add mechanism to autoclose prs
The GitHub repository is read-only and exists so that CI can be run. We
do not want PRs to be issued against the repository, so should someone
do that, the PR is closed with a friendly message pointing them to the
mailing list instead.
- Commit:
c414a013eb17711ab2e1ea447aab4a3a25a09d53
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas.adam@smoothwall.net>
- Date:
match printf specifiers and (cast) types for portability
ok stsp
- Commit:
881327824d65ca303150795897d7f39b5f5370be
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas.adam@smoothwall.net>
- Date:
whitespace fix from Omar Polo
- Commit:
01bb5a15144ece7ca707994fb56e1847c76a1a92
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas.adam@smoothwall.net>
- Date:
fix some integers that had a slightly wrong type; patch by Omar Polo
- Commit:
8f1c06eb7569f957aec944ee5130e28e0cf7c2bd
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas.adam@smoothwall.net>
- Date:
add 'static' qualifier to local functions in got-read-pack; patch by Omar Polo
- Commit:
49d691e8618234a8b0f8d05a1df882c31603644e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas.adam@smoothwall.net>
- Date:
mark some function parameters as 'const', as they should be; patch by Omar Polo
- Commit:
6b78ad28aa9fd55e0c2ae44dea662944bbc279d7
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
libexec: honour libeexec path for helpers
libexec is a common path which is understood by autotools, and
should be honoured.
Patch from Christian "naddy" Weisgerber
- Commit:
326237a6c2a5c369201269e581d6eccd38376efc
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
FreeBSD: tighten UUID check
If UUID libraries are already detected, don't ignore them by then
checking pkg-config, etc.
Noticed by Christian "naddy" Weisgerber.
- Commit:
00ced238c405770dc7df7c18bd32ef055ee03793
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
README: add for Github mirroring purposes
Add a .github/README.md file so that the read-only clone of GoT on
Github, which is used for CI purposes, explains the project.
Also, update the README.portable vesion to patch.
- Commit:
cdf9da3e2fae83e739d1b49c5843b05b813001b7
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
Cirrus-CI: add build YAML file
Cirrus-CI allows for FreeBSD builds as well as Linux.
- Commit:
92a9e85d28a30997176ce0d3c2915e3ea70782c7
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: add FreeBSD support
This adds the capability to compile got-portable on FreeBSD.
- Commit:
e6f4ba3109814ba43d3a9e9c9c9dc55c40149dbc
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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
- Commit:
df3d7c3ef8853d0fa9182dd3f3023a4d5e222ce0
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
stop using the term 'obstructed' ambiguously in the got.1 man page
Specifically, obstructed files are versioned files which should be on disk
but have been replaced on disk by a non-regular file (e.g. by a directory).
The man page used the phrase "deletion was obstructed" which is unrelated
to the above concept and can be expressed as "deletion was prevented" instead.
- Commit:
88d249c247d1925b032b3d0b1ce8cac6aa7d1a6d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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.
- Commit:
dfe86d1fa6f81d3a709059eda591863efd8d5a34
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
plug memory leak in got_worktree_merge_in_progress(); spotted by tracey
- Commit:
2d7ce510f888e8d465497fade1733fbae71b6753
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add a test for 'got merge' which covers a no-op merge situation
- Commit:
10604dce6e625d11974fb5491598bbb54069e5d3
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add a 'got merge' command for creating merge commits
Additional testing by Thomas Adam.
ok tracey
- Commit:
ac4dc26386a91b9c488d78fd7065780e1eaf33d7
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
show parent commit IDs of merge commits in the tog diff view
ok tracey
- Commit:
060188130c8b49319ecc9068d38e1be6a2f70f8e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
update TODO note about HTTP; libtls will more likely be used from dial.c
- Commit:
08511b5ea5860c51130ba3d7b78f85f8ff9de031
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix 'got send' with tree objects which contain symlinks; reported by Omar
- Commit:
3c9bae70cd3e88013fbc91799ba32e3034495597
- From:
- Thomas Adam <thomas.adam@smoothwall.net>
- Date:
manpages: install .5 to correct location
When installing man pages, split out .1 and .5 as they install to
different paths.