Commits
- Commit:
e2bd307e144cf6a7c5a878d68e04bd8c744153ea
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
merge TODO wording tweak: 'got rebase' says "forwarding", not "fast-forwarding"
- Commit:
80be18be44c18ed586311d60524d01633b94cf6f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix bad wording used in previous commit
- Commit:
1756e377b0f3d32399f9bb06d235b261190cbf2f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a TODO item for 'got merge' based on IRC discussion with James Cook
- Commit:
017d8b7bf9006ae1bc36f6b1a38978f2782b363f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
properly initialize csum struct in write_packed_object()
fixes send.sh test fallout on arm64 and should also fix i386
ok op@
- Commit:
14f89e3e5394e931edf4581cfb229beef1de3f41
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
format message digest as hex string directly without snprintf()
ok op
- Commit:
ae25a666dd4099105786ef32f1e6ebaf92abe64d
- From:
- Omar Polo <op@omarpolo.com>
- Date:
add some helper functions to compute hashes
This adds a set of functions to abstract over SHA1Init, SHA1Update,
SHA1Final, their respective SHA256 variants and how to compare digests.
Replace all the SHA1*() usage with the new APIs. It's a preparatory
step for sha256 handling.
ok stsp@
- Commit:
87a3ab84d3eb87b790e3d34aeec2c344a8d7375b
- From:
- Omar Polo <op@omarpolo.com>
- 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:
53bf0b541977b66862040d4b633fb6b5d3a3c6c8
- From:
- Omar Polo <op@omarpolo.com>
- Date:
rename lib/sha1.c to lib/hash.c
It will soon grow functions to deal with sha256 too. stsp@ agrees.
- Commit:
5822e79e39a8777984e08b5d89a8c55d6aa0356d
- From:
- Omar Polo <op@omarpolo.com>
- 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:
af48e677ec38c47d1177ca776b01e299b0f2a96d
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Omar Polo <op@omarpolo.com>
- Date:
gotwebd: add missing colon after 'Message' in diff view
Patch by Josiah Frentsos, thanks!
- Commit:
2bf91741ebcd0f2201d0115e4a7d8c2ab1ba4c30
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
bump version number
- Commit:
1bff81626e23b917b4339eece22253e85936477d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
CHANGES for 0.84
- Commit:
5afebbd1b6bcfecf69d25e367e95c9906245fcf5
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Mark Jamsek <mark@jamsek.dev>
- 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:
fd8d60a2d11af314daec9c6c7ad0ea5c7ac0abd0
- From:
- Omar Polo <op@omarpolo.com>
- Date:
gotwebd: gc unused opendir(). ok stsp@
- Commit:
de51a12a5befe30cf15a089998d0136d52856dc2
- From:
- Omar Polo <op@omarpolo.com>
- 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:
1dda2072ee3eb04988c80d2a72522e489a606914
- From:
- Omar Polo <op@omarpolo.com>
- Date:
log gitconfig.c parser errors to stderr, not stdout. ok stsp@
- Commit:
92e48697fbbd62dbe4f1330698c13c1a93065b5e
- From:
- Omar Polo <op@omarpolo.com>
- Date:
gotwebd.conf: sync defaults
The first example is meant to show the default values for all the
options. Sync with reality.
- Commit:
d51d11be9ba86c2c5cf8d36994e56eeccb905865
- From:
- Omar Polo <op@omarpolo.com>
- 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:
1a0d06a3c2608bd281c3c156a9b008508983decf
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
45e6b2f427b11e0fc760c10ee96eae3a6a5f06e7
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
use newly publicised diff_chunk_type() diff API
To skip chunks without newly added lines.
ok stsp@
- Commit:
c251eeea7a670a2a176084dd3b4ac4dde6c55c10
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
sync files from diff.git e78a8d73c23ee314fdbdf110d5c55866c9ef9680
Moves diff_chunk_type into the public diff API.
- Commit:
249b637c505366856603a932c859a0baf1973d10
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
have ignore patterns with trailing slashes match directories only
ok jamsek
- Commit:
2262237761cd6c8c89a4d4263a8d9c05a7a81d70
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
zap no longer needed forward declaration spotted by stsp@
- Commit:
7783f73c4beef7010e3332dee7f94dad9a54109f
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
3db5a0afedc4111bd9721c0e5229cd217202ac84
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
sync files from diff.git f26db7cd2804ebc6a3f81e7e00e008450eb42228
Contains new APIs for chunk offset retrieval.