Commits
- Commit:
0c4ad42c0a906040e1d0b12ad3f08287006529e5
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got_worktree_prepare_path_info -> got_worktree_path_info_prepare
- Commit:
2b46355293364ffdc9152e59723533a465c5daff
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
rename got_worktree_fileindex_version() to got_worktree_get_fileindex_version()
- Commit:
0d486432bb90c030ac51cbc80a2ef2d69263e98f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make info commands show the work tree format version, too
ok op@
- Commit:
088ea0a1b34b1a9d038a2d0d0e48bb70cd9bcc04
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got/cvg info: print work tree version
This exends got_worktree_path_info() to resemble the "transaction"-like
interface we have for rebase, patch etc. There's a prepare() routine
that returns the fileindex, and locks the worktree, and a complete()
function to free the fileinedx and release the lock. This way, we
can open only once the fileindex in cmd_info() and have the chance
to ask for its version.
ok stsp@
- Commit:
021918ff7717955820540e4a6b6433bebbcbe9b2
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
cmd_info: use got_error_path instead of _fmt
No functional change intended.
- Commit:
37ee718b316ee5003e14168354db4fbac065996b
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
style/fmt
- Commit:
0f6b90a718be86fc6bc1dc4ed98dbf5ecc711c02
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
gotadmin: add flag to `init' to choose the hashing algorithm
Do the same for `got init' too obviously. Repositories created via
`clone' are implicitly sha1 since we don't speak the v2 protocol
(yet).
ok stsp@
- Commit:
93377578d3a22851253313461f9a4ff1900acdd5
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add sha256 support to the worktree and fileindex code
- Commit:
24f6304331e901c27640e5cc5f0524264682dc35
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
bump error string buffer for sha256 hashes
- Commit:
ad18dfab1c13f15a03638c10db626a4f39827d95
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas.adam22@gmail.com>
- Date:
fix histedit -e bug where reverting all changes causes histedit -c cycles
ok op@
- Commit:
6becd17985c1bba6b5ad4b15965378d2fa5b54d6
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
reintroduce the 'got init' command as an alternative to 'gotadmin init'
New users trying out Got for the first time have reported trouble with
finding a way to create a new repository, based on their assumption that
Got works like Git which provides a 'git init' command.
It doesn't cost us much effort to keep this command available in both
programs to make discovery a bit easier for new users coming from Git.
- Commit:
0f24033e38cc689c7c86333f00269a799660dd38
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
plug a leak in a few cmds: forgot to free(cwd) at the end
spotted while investigating for another leak spotted by Kyle Ackerman.
ok stsp@ and jamsek
- Commit:
917cc2e31b6dba9d6598270b07c942a1c41ffcfe
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas.adam22@gmail.com>
- Date:
show hint about update -b if the user attempts to rebase a branch onto itself
Specifically, when 'gut send' suggests 'fetch and rebase required', new users
might try to use 'got fetch' directly followed by 'got rebase' without first
updating the work tree to newly fetched commits. Got would then say "main is
already based on main" without any hint for a way out. Hopefully, pointing
users at the update -b command will make them search the manual for details.
- Commit:
a219eefd27b5f1aafc768c7b6c75ed0e203ee5cb
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas.adam22@gmail.com>
- Date:
add default case to the switch statement in choose_patch()
Just in case the code futher up gets tweaked again such that the
validity check using strchr() will be skipped in some edge case.
Lucas agrees
- Commit:
aeac2f67f6cccbabc915bfd6d54fdaa96d18f180
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas.adam22@gmail.com>
- Date:
make got stage -p behave the same way in interactive and -F modes for 'q'
Lucas agrees
- Commit:
0938a7e202849b4c8369dac2e1583f4c686ba3e4
- From:
- Lucas Gabriel Vuotto <lucas@lgv5.net>
- Via:
- Thomas Adam <thomas.adam22@gmail.com>
- Date:
got: refactor choose_patch
Unify the handling of a response file and interactive use, handle EOF,
fix a memleak and make it easier to extend in the future. In particular,
interactive mode now doesn't loop forever on EOF.
Patch by Lucas Gabriel Vuotto.
Joint work with op.
- Commit:
3779dc8f300635352ce960e273f33f50177b83aa
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
backout got stage -R option addition
The stage command is usually used in a recursive manner, like 'got commit'.
Forcing users to specify -R all the time is deemed too inconvenient in
practice.
discussed on IRC with Lorenz (xha), Omar, and Lucas
- Commit:
c24e2d2e71abf0ac4feb95dc4f238d454819fed9
- From:
- Lucas Gabriel Vuotto <lucas@sexy.is>
- Via:
- Thomas Adam <thomas.adam22@gmail.com>
- Date:
replace date, strftime %G-%m-%d with %F
Use the more predictable %F, aka %Y-%m-%d, instead of %G-%m-%d. %G
follows the definition of ISO-8601 week-based year, which is weird.
In particular, 2024 is one of such years with weird behaviour:
$ date -jf %Y-%m-%d +"%F %G-%m-%d" 2024-12-30
2024-12-30 2025-12-30
Diff from Lucas Gabriel Vuotto (thanks!); stsp agrees
- Commit:
6d1e5fdc3f135929f40d4a92a6a4b8bc0f0a61e5
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas.adam22@gmail.com>
- Date:
rename a function to avoid gramatical ambiguity
- Commit:
a6dfa7b2fc6f025f11ff57a315c99d96014550d8
- From:
- "Lorenz (xha)" <me@xha.li>
- Via:
- Thomas Adam <thomas.adam22@gmail.com>
- Date:
require -R option for staging or unstaging directory contents
-R is needed on almost all other commands so this makes things consistent.
Patch by Lorenz (xha)
- Commit:
37e7d69e10aa17ac243e96c3205d766f02cf58a0
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas.adam22@gmail.com>
- Date:
Add initial read-only http fetch support using a got-http helper.
Currently we only support the smart protocol with a limited feature set.
ok stsp@ tobhe@
- Commit:
a6955b87407110ed6d51627190bbb4a514e885d1
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas.adam22@gmail.com>
- Date:
get rid of unnecessary "dns inet" pledge promises while fetching via git://
- Commit:
cd634f2d6d87577ed25d69f9b9a9d07c990a4223
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got status' display interrupted rebase, histedit, and merge operations
When an operation is interrupted add a trailing message to status output
which displays the operation and branches involved.
This information will be useful when diagnosing problem reports and it
helps new users with contextualizing multi-operation work tree state.
ok op@
- Commit:
fb077d79464b5f22bd16cb8b0ce4069c749115dd
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
forgot to unveil the log message file passed to got commit -F
found by op's regress builder
- Commit:
dada399a5c3d460b46744b7270bb9b07b44c42c8
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fold some long lines