Commits
- Commit:
5c02d2a555dc01ac06db5a47b8c81adf2bf3f8a6
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
5267b9e4960076d7de62633b9f5f1dcdb6594b33
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
963ac08a0c965b18b47c0c444eeab1580183b3c9
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
match printf specifiers and (cast) types for portability
ok stsp
- Commit:
474b498221b19828b2bcb8e5c5b2ced63acbd1a6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
whitespace fix from Omar Polo
- Commit:
030daac821622c8495676bc5210fb7784c7ae78f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix some integers that had a slightly wrong type; patch by Omar Polo
- Commit:
50127d69d134221cbcaa9ca3e173dceac051952c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add 'static' qualifier to local functions in got-read-pack; patch by Omar Polo
- Commit:
fda3525ecfaa5f1d603ab52254172b68ad177ed1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
mark some function parameters as 'const', as they should be; patch by Omar Polo
- Commit:
f6764181d7e0fc68673b90cbc93d6064509d0bd7
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
f365d76274ee1ae2b57225686a0733176fc4bfb2
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
1acd48bccbe935fbbd39c3387b92b0fb6aaf444f
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
793fcac3d46049fc9505ccf53b23af592bfdb963
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
plug memory leak in got_worktree_merge_in_progress(); spotted by tracey
- Commit:
a6a8f8bbb699f0f18ebd74c5aa76f6ceb2221f8d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a test for 'got merge' which covers a no-op merge situation
- Commit:
f259c4c18277237ced1043033cb1af739f73db28
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a 'got merge' command for creating merge commits
Additional testing by Thomas Adam.
ok tracey
- Commit:
9f98ca0596877b609e3785a877d36dca6c774c24
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show parent commit IDs of merge commits in the tog diff view
ok tracey
- Commit:
0e5df9843b907e2f3bb8bae341f4ac0d5762346a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
update TODO note about HTTP; libtls will more likely be used from dial.c
- Commit:
3af9de885a0d557ecb7810536cd451f3c320fa68
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix 'got send' with tree objects which contain symlinks; reported by Omar
- Commit:
ad324bf53a11587dc227a2c00b65020595aa18dc
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix histedit_no_op test which was failing randomly
A no-op replayed history ends up having exactly the same commit IDs
if all commits are created at roughly the same moment in time.
There are no content changes involved so if commit timestamps do not
differ then commit hashes will be the same. In which case there is no
fork in history for 'got histedit -l' to display, yet the test was
always expecting a fork in history to be displayed.
Update the test to take this issue into account. The test will now pass
no matter which result is produced by the histedit operation.
Problem found by Lucas who observed that this test was randomly failing.
Patch also provided by Lucas.
- Commit:
34c3415fac1e6f7bb8fb803417020063834c6112
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
update README blurb about 'ssh 127.0.0.1' requirement for regress tests
- Commit:
3da8ef855d7d7b3da96a9f1cba55df276e112f11
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
tog: use sched_yield(2) instead of pthread_yield(3) for portability
pthread_yield(3) is an optional POSIX 2001 extension while sched_yield(2)
is part of POSIX 2008. On OpenBSD they are actually equivalent, albeit not
documented as such. Using sched_yield(2) helps the -portable version.
Patch by Quentin Rameau
- Commit:
6062e8ea890c053733ec0ad3387a40da18a45cda
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
tog: document why _XOPEN_SOURCE_EXTENDED is set and don't undefine it
- Commit:
ac372b601e0be8eb794f071912ddb1efc81ea8a8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
'got status' does not have a -q option; remove it from got.1 synopsis
- Commit:
df7dea6e70ae149a51b80d537544c007bdb03258
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add -S option to 'got status' synopsis in got.1 man page
- Commit:
7dd7d39b1e5196830234690ea1db776cf036a4bf
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
bump version number
- Commit:
4a87b3701d0c943155b64f698e7d9db32ba57fbb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
CHANGES for 0.60
- Commit:
67d7451ca0b909687a2689243077b8d7edb65102
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
shell code fixes
Escape sequences are not handled by every echo(1), e.g. not on FreeBSD.
'?' is a glob character and must be quoted.
'!' is not a shell meta character.
ok tracey stsp