Commits
- Commit:
eb81bc23c735e8aa9eaee796a230c7d7c76657ba
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
move got_opentempfd out of open_blob. ok stsp@
- Commit:
db0dfdd7e5c2c5a38ed7c3291a0615132bcb5945
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: handle git-style diffs for the 3-way merge too
tweak and ok stsp@
- Commit:
497a59156be73918988396d3f7378fb8c7b6da8d
- From:
- Omar Polo <op@omarpolo.com>
- Date:
handle blob ids without corresponding blob ids
ok stsp@
- Commit:
9802c41ca727979975e9ee6fbd898dfec7f283c4
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: use status G for merged files (and document it)
Suggested by stsp@. This makes possible to tell if 'got patch' used a
merge-base from the repository for the 3-way merge or did a simple
search/replace operation.
While here update the tests to look for the 'G' status and the manpage,
which was also missing the documentation for the 'C' status in got
patch.
ok stsp@
- Commit:
dbc68eedb1de26bf5a444ecad5150b0a243d422b
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: ignore blobs not found
since diffs are often enclosed in other formats (e.g. emails) we might
parse something and think it's a blob id when it's not. This should
already happens, but apply_patch is looking for the wrong error due to a
leftover from previous attempts. Reported by stsp@
while here tweak the test_patch_merge_unknown_blob to also try with a
dummy commit id, as now got-read-patch requires it in order to consider
a blob id.
ok stsp@
- Commit:
d8b5af438b16bcea5568b1d4bfc127567e35e2f6
- From:
- Omar Polo <op@omarpolo.com>
- Date:
use the commitid in the patch diff3 conflict header
suggested by and ok stsp@
- Commit:
55e9459f41acc72438ed2c9f75fdaeae8f5c41d8
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: use diff3 to merge the changes
Parse the "blob -" metadata in diffs produced by 'got diff' and use the
original file for patching. Then, use the diff3 with the current
version of the file to merge the differences.
This solves many failures automagically or at least turns them into a
conflict.
ok/improvements stsp@
- Commit:
05737d499ba523bccc36cbb584307259af88da88
- From:
- Omar Polo <op@omarpolo.com>
- Date:
patch_file: fill tmp with the patched file even in nop mode
future work with diff3 merge will need the fully patched file even in
the nop mode
ok stsp@
- Commit:
827bcd6cc3f70dfd7830fe13e687ce1885d5d670
- From:
- Omar Polo <op@omarpolo.com>
- Date:
patch_file: move file ownership to parent
ok stsp@
- Commit:
1b1b91abdb4cd380995e3542580daa8700d93f6f
- From:
- Omar Polo <op@omarpolo.com>
- Date:
style: remove double semicolon
- Commit:
06c44edcbf03f02d1d7c07f9360de526dd4203d3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
check for errors from fclose() in patch_file()
- Commit:
11ce22a1a15a25df1218e6cd79c7c0ff7e951b63
- From:
- Omar Polo <op@omarpolo.com>
- Date:
plug memory and fd leak in got patch
- Commit:
35095610b1bb11a6c722f6d42f6609bd308531a8
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: use ints for line offsets instead of longs
ints have the advantage that their size is more likely to be the same
across the various architecture supported by OpenBSD, thus introducing
less possible differences.
INT_MAX is still (at least) a few order of magnitudes higher than the
patches we dealt with (even abnormal ones.)
suggested by stsp@
- Commit:
5b7126c502f8d046d0779dd2cb0558163c383819
- From:
- Omar Polo <op@omarpolo.com>
- Date:
actually guarding against negative line offsets
previous commit looked at some pretty zeroes returned from calloc
instead of the actual numbers received.
- Commit:
2399b53d3a5f7a784efc54b86027b4f50f65ac41
- From:
- Omar Polo <op@omarpolo.com>
- Date:
style; set datalen only once