Commits
- Commit:
5d8cbca3b331d9f20dc4ee509342988c82e11656
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
pull in a type fix from the OpenBSD parse.y template
Original commit message by deraadt:
(unsigned) means (unsigned int) which on ptrdiff_t or size_t or other
larger types really is a range reduction...
Almost any cast to (unsigned) is a bug.
- Commit:
d683c314c5dae715e5918b3952e8c5870db83648
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
fix unsigned/signed char mismatch in parse.y
- Commit:
fa161f0bf4d34a678ba30bf62f5e8eec44ceb931
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
update a CAVEAT in got.1 now that 'got merge' exists
- Commit:
cd33da4893c91d59c1e0a4f296e07c08cfd82bcb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
interrupt 'got histedit' upon missing/unversioned/not-deleted files
- Commit:
1fa4907213af37d50029ee33b989867f41f0f124
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
interrupt 'got rebase' upon missing/unversioned/not-deleted files
- Commit:
606719cd7bdc625a582f93ddbc966675568f0026
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
document all reasons why 'got merge' might be interrupted
- Commit:
c1b057235b48f7b8bc01bd3c31348517856bc68b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got merge' interrupt the merge upon undeleted and unversioned files
- Commit:
35ca1db76b33010a85a6d0e68e5d78d451028269
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
print additional stats about things that went wrong during a merge
- Commit:
965803d33ff4b7472b22868076e8cbc13b069218
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix 'got fetch' downloading too many objects in some cases
Always announce all local references to the server when fetching changes.
We used to do this only in mirror mode. In regular mode only refs/tags
and refs/remotes/origin were announced, which could result in unnecessary
downloads if relevant objects exist in refs/heads or elsewhere.
- Commit:
9dd14b990bedd4bcdfc1b21cdb8034be103f574b
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
got_sha1_digest_to_str() writes to char *
ok stsp
- Commit:
14af92996aee5b567441c4d2d56d236d8c979bed
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
fix unsigned/signed char mismatch in parse.y
ok stsp
- Commit:
31e61ec13d43c2edd56e80f39079f8345c7c9411
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
match the unsigned char type used by the zlib interface
ok stsp
- Commit:
0ff8d236625b5d8329e10e9b812cbdef76917ba6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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@
- Commit:
321a74a5caf6877e6bbbfb6b160763c790d79d16
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
garbage-collect unused "dist" target from subdirectory Makefiles
ok stsp
- Commit:
088449d31db27c8682d5e9dc737d92d05df6605e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
implement 'got merge -n' which interrupts before creating a merge commit
- Commit:
4e91ef1519233965edd1bbd83f6699f669c8f9d6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make it possible to merge vendor branches with 'got merge'
- 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.