Commits
- Commit:
2ccc0ca266e0019fc955fdfbd21d34f96d481103
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: release 0.84
- Commit:
b221ffcbb1a5002260d0a678b8734656f6e18670
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: remove endian.h
This is included portably.
- Commit:
98670ba726486c39efff220ab1e074c62023aae7
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: rework SHA detection
Simply the SHA detection by not predicating on libcrypto, but instead
checking individual header files.
- Commit:
4680f704353811c8bb6ce65eac3714d1bd200c26
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: remove sha1.h; found portably
Remove sha1.h as this is found portably across systems.
- Commit:
54bac5ec34cd08d8ecedaab13def1cfce4e4dae2
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: update Makefiles
sha1.c -> hash.c
- Commit:
c8ae092d079ca1c9f5f2a7e44c73948cd55454e7
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
provide functions to parse/serialize different hashes
it abstracts over the hash type and ensures that object ids are zero'ed
before their sha1 digest is written. Needed by the incoming sha256
support.
ok stsp@
- Commit:
be288a59f42e0b5e203e2c5545bf3e042ff4b79f
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
rename lib/sha1.c to lib/hash.c
It will soon grow functions to deal with sha256 too. stsp@ agrees.
- Commit:
588a8092bc282294ee23585991e81586905a8fd4
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
include sha2.h too where sha1.h is included
In preparation for wide sha256 support; stsp@ agrees. Change done
mechanically with
find . -iname \*.[cy] -exec sam {} +
X ,x/<sha1\.h>/i/\n#include <sha2.h>
- Commit:
283e0dd797af94cb97c099ffa83d57b55a595876
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
gotwebd: add missing colon after 'Message' in diff view
Patch by Josiah Frentsos, thanks!
- Commit:
3f478b8d2ca6d5109aff62b5b95854751e793fa6
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
bump version number
- Commit:
5e95dc0fc2c2aa8d8ef88b231bf789f845cc8b49
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
CHANGES for 0.84
- Commit:
9382c10a8a595c1f3341daf047ada04346b51408
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix tog diff between arbitrary commits
Don't assume commit info is always written. This is only true when diffing a
commit against (one of) its direct parent(s). Otherwise we perform an invalid
read on a tmp got_diff_line array and end up passing bogus offsets to fseeko().
Bug found and fixed by stsp with a minor tweak by me.
ok jamsek for stsp's initial diff
ok stsp@
- Commit:
ec629cf4ad5084d3f423ea1b906903baa050918e
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
gotwebd: gc unused opendir(). ok stsp@
- Commit:
2cf2727869f4962f1624068c72a409a05b7b5fc7
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
gitconfig.c: look for comments after trimming the start of the line
This fixes the (harmless) errors raised by gitconfig.c on indented
comment lines and adds a test case for it. Reported by James Cook,
thanks!
ok stsp@
- Commit:
5fab8a45de8c63893f21c921fea101ddcc8750c9
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
log gitconfig.c parser errors to stderr, not stdout. ok stsp@
- Commit:
a15b57cdbde55dae32b73459f223ce80be41fa38
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
gotwebd.conf: sync defaults
The first example is meant to show the default values for all the
options. Sync with reality.
- Commit:
b16f18320c2d00bb467b50672a03e2665791ceda
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix 'got merge' so it parses gitconfig for author
cmd_merge is the only subcommand that may create commits that doesn't
parse the git config files, thusly failing for users without GOT_AUTHOR
defined.
Problem reported by James Cook who also provided an initial test case,
thanks!
ok jamsek
- Commit:
c12ab9ad7f32b9eb712734e776de2f7b0370e643
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix "got fetch" hang against out-of-date remote repositories
Do not assume that remote repositories will always have our objects.
In Git protocol terms: Do not wait for an ACK from the server before
sending the final "done" message. Otherwise servers might be waiting
for more have-lines from us in order to find a common ancestor, which
will never be sent by us.
Problem reported by James Cook who also provided an initial test case
ok op@
- Commit:
47c7ee21b5f269eed3127db9d3ac7c490d1ecf0a
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
use newly publicised diff_chunk_type() diff API
To skip chunks without newly added lines.
ok stsp@
- Commit:
ae012d47ffe30ad1e3d00cbca2485f2c10a0f558
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
sync files from diff.git e78a8d73c23ee314fdbdf110d5c55866c9ef9680
Moves diff_chunk_type into the public diff API.
- Commit:
1b5d300f3ff325202e42e0a05b1f23f1d8b8e839
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
have ignore patterns with trailing slashes match directories only
ok jamsek
- Commit:
52ca43c16adaa0fec4ba91933386fe4970f6bacd
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
zap no longer needed forward declaration spotted by stsp@
- Commit:
450d9f6b216b7cdde9e4079e0db459d3bd2caa0d
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
use chunk offset to efficiently detect conflict markers
Rather than skip lines, use the new diff APIs to directly seek to each
chunk with newly added lines for more efficient conflict marker detection.
ok stsp@
- Commit:
db9ae6560f9f90548b4e4d4d69f372b51f869792
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
sync files from diff.git f26db7cd2804ebc6a3f81e7e00e008450eb42228
Contains new APIs for chunk offset retrieval.
- Commit:
5d6fee7370df74c4ac3200261b2bf821c5b52f9c
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
extend test_import_ignores test coverage
Cover the case where a regular file would match if the ignore pattern did
not have a trailing slash.