Commits
- Commit:
7e91f3d2e1322160a4db79cd753888592c6fbf18
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
2a31b33bf654723ac3cf71726e41425f7fa9ab7b
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
5daf5c53287d227ebc29ad1b0d934b4731ad5990
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add a way to ignore author and remote repository info found in Git config files
ok op@
- Commit:
1684783ba639c742760dd97cd87213e89189c7dd
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
drop (needless?) sleep(1) in status.sh
ok stsp
- Commit:
f4602cbd0dc693f398f68e64406240dcba6b57c0
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
408db73d08e36bce6cbc5780738f3517b1297ee1
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make mandoc -T lint got.1 happier; pointed out by Mark Jamsek
- Commit:
d4dddcbf5ea08034898e5d6dda70b9a82f8274fa
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
document use of GOT_AUTHOR by 'got rebase' and 'got histedit'
- Commit:
cae49de0a80da9ab02ce855debdd56fb0be36400
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got histedit' fetch author info from Git configuration as a fallback
- Commit:
8db00f97570360c732c5c8b9ab0f0415e74184c0
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
598139dd22c7c7517a6542803c64e88acd78b162
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: add repo version to main string
When compiling got-portable from source, outside of an official release
tarball, it's often helpful to know which commit the binary was built
from, especially for diagnostic purposes.
This adds an extra hook to AC_INIT to derive whether -portable is being
built in-tree or via a release tarball.
- Commit:
e80b37ed23f3a4daa623c92b650c7049a8157d66
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
1be4947a5c2d3f42e8dda37929997907d116b746
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
tog: uppercase alpha key maps that open new views
ok stsp@
- Commit:
94ecf40da5315d7cb59ff90ac23614ac0f2a4f3a
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
3a0139e86b2f9a57742d59dad86f8386532ba872
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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@
- Commit:
150d7275caef04226a9f0c82b7b6c7ac62cfab0e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
reset committer during rebase and histedit
ok op@
- Commit:
892eab0a82532775a97ff23efda990ad80d35896
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
call time(3) just once in commit_worktree(), not twice
- Commit:
f4e6231a850cc8e3edfb791f86ca3f8f4a9d6245
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
tog: populate new child view log lines when switching split
When switching a child log view from a h- to a v-split, new log lines are
empty. Rather than (mis)trace height and (not) call request_log_commits(), let
resize_log_view() do the math and request commits if needed to draw new lines.
ok op@
- Commit:
0ee22038e37ccc4b67297627b9084eac852e46c2
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
do not forget to free(cwd) at the end of cmd_rebase() and cmd_histedit()
- Commit:
81d5d80e4c68d79d6443f65602599ae708caf4c1
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix wrong error return in cmd_commit()
- Commit:
7c60996cbac298efd8023b1b599d13371ae61963
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
comment tweak
- Commit:
0b1c1d9c3d925795955ba06a2ea73228e1c1d112
- From:
- Lucas <lucas@sexy.is>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got_repo_pack_fds_close: don't close(0)
got_repo_pack_fds_close will try to close all of the GOT_PACK_NUM_TEMPFILES fds,
even the ones that didn't manage to get a value from got_opentempfd(), which
would result in a close(0) if we do not initialize to -1 here.
- Commit:
46cd746291ccc886182febe93e8bec284bebf7c5
- From:
- Florian Obser <florian@narrans.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
Correctly track if we sent more data since the last time we looked.
With the narrow scope of bytes_sent_cur it would always be zero, and
we would always update progress.
Found by llvm's scan-build (Dead store).
OK stsp
- Commit:
512073980d39824ebc694507be294838a4dcc904
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: MacOS: export env from configure
Compiling -portable on MacOS directly would never have worked, as the
environment was only being set when run under CI.
Move these checks into configure.ac so that they propagate out to make,
etc.
Noticed by cjones on IRC.
- Commit:
6ddaab3f7ace0aa9244989ee27cda0c074f7f99a
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: remove stray .orig files
These shouldn't have been commited, and probably predate when the
.gitignore file was updated to filter out .orig files.
- Commit:
732c70f595eef7db741177f2dfd61b8bd27f156e
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: gotwebd: add headers to EXTRA_DIST
Add the header files under gotwebd to EXTRA_DIST so that they're
included in the distribution tarball.