Commits
- Commit:
d27161034833cc359a3fec898d6ddd388ad2622e
- From:
- Omar Polo <op@omarpolo.com>
- Date:
gotwebd: fix double Content-Type (and the typo)
ok tracey@
- Commit:
c72da327af6cd2fde74d7803b528dccf2af02ecc
- From:
- Omar Polo <op@omarpolo.com>
- Date:
warn about the interaction between got patch -p and -c
suggested by stsp@
- Commit:
5f56d41e1acd9cce7202960acad0cab3516e9c26
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: add -c flag to apply at a specified commit
it's useful for e.g. to apply old patches that weren't generated by `got
diff' or git-diff(1) and so lacks the metadata needed for the 3-way
merge.
manpage improvements from and ok stsp@
- Commit:
615e455c6bdddbd4e59d5d0dece41eb9953b6336
- From:
- Omar Polo <op@omarpolo.com>
- Date:
simplify got_patch/apply_patch to call reverse_patch in one place once
Current code is overly complex; it looks if the diff *might* use diff3
merge to postpone reverse_patch until we know for sure. Instead, just
reverse_patch in apply_patch once we know if merge *is* used or not.
- Commit:
0543436dc194839e6e3ffa7cecc87f4774eb0350
- From:
- Omar Polo <op@omarpolo.com>
- Date:
add a simple test for 'got diff' against CRLF files
- Commit:
8d504b53f2bee4e17d49158a312294699094ed1e
- From:
- Omar Polo <op@omarpolo.com>
- Date:
sync files from diff.git ed9312f04bcebc7aee4f7e7d96d6ec467cb9bb66
- Commit:
2ed050c519e5d5706f53064a0e604533244ff969
- From:
- Omar Polo <op@omarpolo.com>
- Date:
`got patch' pledge early
ok stsp@
- Commit:
595228385f8c74590756ff446d5b84aad0ebfda7
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: error if patchfile isn't a regular file
`got patch' cannot read patches from non-regular files for obvious
reasons. However, it could crash in sendmsg because pledge doesn't
allow to send file descriptors referring to directories. So, restrict
`got patch' to operate on regular files only and fail otherwise.
This still allows to read patches from symlinks since they're resolved
at open(2) time and the file type check is performed after.
There may be a marginal usefullness in reading patches from fifos, but
the current code doesn't allow that anyway since got-read-patch needs a
seekable file descriptor anyway.
ok tracey@
- Commit:
04aed1557bf2e67bfef8d3a991fd54526142c8a8
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
fix off_t type mismatches
off_t is a signed type and depending on the platform, it can be
"long" or "long long", so cast to long long for printf().
ok stsp
- Commit:
10a16316a03005a07c45b2bbf1b5644b64e846fb
- From:
- Omar Polo <op@omarpolo.com>
- Date:
tweak cmd_info; no functional changes intended
* don't allocate unused pack_fds
* drop wpath, cpath, proc, exec and sendfd pledge promises
* close the worktree
ok stsp@
- Commit:
1004841d7c8045b627768a441ebdb9c824d2134d
- From:
- Omar Polo <op@omarpolo.com>
- Date:
don't undef GOT_AUTHOR in regress
unset only in the subshell so further cose is unaffected. ok stsp@
- Commit:
7370f8029cdaf59e59f78cfc866eeb7b82c76e74
- From:
- Omar Polo <op@omarpolo.com>
- Date:
use GOT_IGNORE_GITCONFIG in regress
fixes test_rebase_no_author_info when a valid ~/.gitconfig is found.
ok stsp@
- Commit:
4fa16b393ac52eadd8159d265e31961b11a10a25
- From:
- Omar Polo <op@omarpolo.com>
- Date:
read_gitconfig: fix GOT_IGNORE_GITCONFIG case
set gitconfig_remotes to NULL to avoid a double-free, and reset the
global author name/email fields too.
ok stsp@
- Commit:
136e2bd4b6c85e936c03593405dbdfcefb34fb79
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
tog: refactor key map -> new view initialisation
Deduplicate view initialisation boilerplate and simplify new key map view
requests with dispatch routine. Includes improvements suggested by stsp.
ok stsp@
- Commit:
3e0f95fc704e82b2b916e10c016299e1b49e8383
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a way to ignore author and remote repository info found in Git config files
ok op@
- Commit:
2c8899b952f67f90ab3a26b4331491832fe93c8a
- From:
- Omar Polo <op@omarpolo.com>
- Date:
drop (needless?) sleep(1) in status.sh
ok stsp
- Commit:
38d61ead4d6e9ff3f44b8d6e0e7ff3d02ffcec26
- From:
- Omar Polo <op@omarpolo.com>
- Date:
fix `got patch -R' when using diff3 merge
`got patch -R' fails spectacularly when applied on a diff that contains
the info of the original blob for the diff3 merge machinery since it
tries to apply the reverse of the patch to the old blob.
change it to run the patch (_not_ reversed) on the old blob and then
swap the arguments to got_diff3_merge which gives us the correct reverse
merge of the diff. while here add a test case too.
reported by naddy, discussed with and ok stsp@
- Commit:
65858f9a993c163be8f4af482e7b400535d61d17
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make mandoc -T lint got.1 happier; pointed out by Mark Jamsek
- Commit:
7f5531cddb475a234ab659960efcb4f1aee3fb8d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
document use of GOT_AUTHOR by 'got rebase' and 'got histedit'
- Commit:
543bec4ff9437a6e01b7e86770938007190e52df
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got histedit' fetch author info from Git configuration as a fallback
- Commit:
50e7a649ac62e04706162f1e9b7b37e7485fc7ca
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
do not require local author info during 'got rebase'
My commit to reset committer info during rebase was too strict
in some use cases. Even when simply forwarding a branch the rebase
operation could now fail if GOT_AUTHOR is not set.
To fix this, fall back on existing commiter information if no author
is configured. And try to obtain author info from Git config in case
GOT_AUTHOR is not set.
Problems reported by Mikhail.
- Commit:
0f91044a8e1edfa553268e8437f58c21e1e4ac39
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix name clash in gotwebd
Rename GOT_PACK_NUM_TEMPFILES in gotwebd, since it clashes with
a name already used in lib/repository.c.
ok tracey
- Commit:
5e98fb339b4588f8e07c12b9f9ace9dbdcc47592
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
tog: uppercase alpha key maps that open new views
ok stsp@
- Commit:
01a7bcaf15198d23a77acc28899c3c206cdc5001
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
tog: reset view->offset when clearing log view state
Don't move the selection cursor due to a bogus offset after closing child views
following use of 'B', C-l, and backspace log view key maps.
ok stsp@
- Commit:
6fe51fee00c219cf4a74684211a620b3ff9f02ef
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
tog: use view->resize idiom to ensure log is populated
Replace view->mode == TOG_VIEW_LOG checks for requesting commits to populate
the log view with calls to view->resize().
ok stsp@