Commits
- 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.
- Commit:
d0f874e072cfb4119033a71b9f162ae02eca44ab
- From:
- Stefan Sperling <stsp@stsp.name>
- 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.
- Commit:
076fbedce1fccdd95af706a8b068aa8a49c88165
- From:
- Omar Polo <op@omarpolo.com>
- Date:
use struct got_object_id instead of sha1 digest in a few imsg
change got_img_commit_painting_request, got_imsg_tag_object and the data
of GOT_IMSG_TRAVERSED_COMMITS not to copy the sha1 digest to the imsg
buffer and then from it to a new struct got_object_id but send directly
the whole struct.
ok stsp@
- Commit:
b685c8da4da0617ce1f98749fbd7014bda6d3fc3
- From:
- Omar Polo <op@omarpolo.com>
- Date:
copy whole object id not only the sha1; missed in previous commits
- Commit:
53e553e8ded01524f60c018b2266acc39af30669
- From:
- Omar Polo <op@omarpolo.com>
- Date:
tweak send_zero_refs; use GOT_SHA1_STRING_ZERO
ok stsp@
- Commit:
d952957db624ae4f22a8bf310c4ab918f3a9dbd3
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
optimise parsing of modified files for conflict markers
As per stsp's original design for detecting new conflicts, rather than produce
a diff formatted for human consumption, parse the raw diff result to scan only
newly added lines for conflict markers. While here, fix a couple related bugs
in the original implementation: (1) rewind the versioned file blob so we don't
end up with an empty "from" (i.e., LHS of the diff) file; and (2) force an
ASCII text diff for so we don't miss conflicts in binary files.
ok stsp@
- Commit:
2b5b58792b27164b1bbcbfb25180ce2ea5986e3f
- From:
- Omar Polo <op@omarpolo.com>
- Date:
gitconfig.c: fix read/write out of bounds
conf_parse_line advances the `line' pointer without decrementing the
line size `sz'. This makes the parsing code mistakingly reading from
the next line (`line' is just a pointer in a bigger buffer that holds
the whole file) and may mangle it by writing NUL bytes in it.
Add also a new regress case to trigger this case.
Reported by falsifian on IRC, thanks!
ok stsp@
- Commit:
cd0aa8caa26478b2cb3c60e889894de02e0eb921
- From:
- Omar Polo <op@omarpolo.com>
- Date:
gitconfig.c: fix printing of debugging logs
all the othe LOG_DBG calls assume \n is implicit (like with err(3)), so
remove the only explicit \n and make log_debug printing a newline too.
- Commit:
fee52bbff055c2853bc5f657f511f4851338a19a
- From:
- Omar Polo <op@omarpolo.com>
- Date:
gitconfig.c: unbreak build when GITCONFIG_DEBUG is defined
- Commit:
123836732402b1204e5be68f98a69084285c316d
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
add ci/he/mg/rb -C option to commit unresolved conflicts
As per stsp's suggestion and building on his initial diff, add the -C option
to enable creating commits with unresolved conflicts to the commit, histedit,
merge, and rebase commands to allow continuing the operation despite files in
conflict status. Also, only search for conflict markers in newly added lines
to enable working with files already under version control that may have
conflict markers embedded verbatim.
lots of tweaks, improvements, and initial diff + ok stsp@
- Commit:
f990756a3987ba6410baf611d561e9b8f285f047
- From:
- Omar Polo <op@omarpolo.com>
- Date:
use SHA1_DIGEST_LENGTH instead of sizeof(id)
ok stsp
- Commit:
bf1c78e5100932aa445b8ef07ebf9b712500c67e
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
update regress for fetch tweaks added in previous commit
ok stsp@