Commits
- Commit:
fd7552d245966f4a57fdc5ec287c3226d5145391
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
implement support for keywords as got <commit> arguments
This begins enabling the use of keywords in got wherever commit ids or
references are used, with more work intended to expand support across all
such instances (e.g., branch, checkout, etc.), and add more keywords.
The keywords ":base" and ":head" can be passed to 'got {diff,log,update} -c'
commands as a substitute for the corresponding commit hash id. Keywords and
references can also be modified by appending a ':+' or ':-' and an optional
integer N to specify by first parent traversal the Nth generation descendant
or antecedent, respectively. If N is omitted, a '1' is implicitly appended.
tweaks + ok op and stsp
- Commit:
0c2ef172a69b83723fda636ca209754ac7995dc1
- From:
- Omar Polo <op@omarpolo.com>
- Date:
typo
- Commit:
4a1a737306fe863c1d6378370d345fae962a2cad
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
fix diff and log diffstat tests broken in 65dedee0a2cd
I failed to update regress when changing the diffstat summary line in the
previous commit to use a singular noun after 1.
ok op@ and stsp@
- Commit:
5763426aa30e7fbf05748c70f44f7b435fcb511d
- From:
- Omar Polo <op@omarpolo.com>
- Date:
regress: replace echo \n with printf and heredoc
echo \n is not really portable. Not that it matters since the regress
suite is already using non-POSIX features (like `local'). However, it's
the only place using it and easy to fix.
ok jamsek
- Commit:
8f4e3da96c5f4996c58dc6276417edf32c9589aa
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
add regress for new got log -d switch
ok stsp@
- Commit:
f1aec6edf3cf139d631d740ffc7f9428c913685c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix regression test failures with Git 3.30.5 / 2.38.1 or later installed
The fix for CVE-2022-39253 in Git made our regression tests fail since
creating submodules from local clones is no longer allowed by default.
Add an override to our invocations of "git submodule add", the same
which was added to Git's regression test suite as part of their fix.
This CVE doesn't otherwise affect us. We do not implement submodules.
Our use of them in regression tests exists only to ensure that Got does not
freak out when it sees one. Precisely because automated support for nested
repositories and/or working copies (as in Git Submodules, or Subversion
Externals, etc.) have been an endless source of security problems in
other systems.
sudden test failures pointed out by naddy@
- Commit:
5e91dae4dd43b8024731223110ab18f505f453ac
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove trailing whitespace; patch by Josiah Frentsos
- Commit:
02a5c5d00338c9549f6a399391841bd8219d91cf
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move 'got init' command to 'gotadmin init'
This functionality is better suited for gotadmin because it is
technically a server-side repository operation when we consider
the 'got' tool as the client-side tool.
I have plans to move 'got import' into gotadmin as well.
ok op@
- Commit:
8469d82143a591d423c000c47c63bababe6f5716
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
always show commit or tree IDs in diff header, in order to help 'got patch'
The idea is that got patch can simply look for a line such as:
commit - abcde1234567...
to find the merge base commit ID to show in diff3 conflict markers.
got log -p now displays commit IDs in its diff header, instead ofl
tree or blob IDs.
ok op@
- Commit:
783ffc01fc5be0775c44984236ac9f1d1d0ad581
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
adjust expected test output after got log -s changes
ok op@
- Commit:
c1c775ebf431921ec88711e07b197edd07e05bb5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add one-line output mode to got log with -s flag
-s for short. Moves log search to -S.
Patch by Evan Silberman
- Commit:
49c543a6fe888394ca86e6399c706a9965486134
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
use test(1) -eq and -ne to compare integers, and reduce quoting
This brings the rest of the regression test scripts in line with
patch.sh.
- Commit:
138e4f4798d5a09e2b97c9a18e49999fb8ff599b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
display the requested object type when an object could not be found
ok millert@
- Commit:
a96621150027f46d946238e99c8236a06f79f0da
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
add missing "return 1" to failure handling in the regress scripts
ok stsp@
- Commit:
54c39596938ae6d19fe5eede072d36a3f61baa12
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA
- Commit:
7f9bfb3188bd9d77317f3205b61e96c7a55b005a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
replace resolve_commit_arg() helper in got.c with got_repo_match_object_id()
- Commit:
603cdeb0c7bcddc1abea9ced622f6eaa82c00f35
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got log' avoid got_repo_map_path() if run in a work tree
ok naddy
- Commit:
f6cae3ed1ef0c22150181eeebb8f9e97db99dc5a
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
switch function declarations from Korn shell to Bourne/POSIX shell syntax
ok stsp
- Commit:
7fb414ae4d46ebdaeff458477ba801f9ad5853c4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a -q option to tests for quiet output and use it for 'make regress'
Previous default output remains when test cases are run individually.
ok tracey
- Commit:
502b9684f951602db159ea8e357e404480666eec
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got log' -R and -P options work in combination
With -R, the -P option did not show any paths.
Regression test added here demonstrates the problem.
- Commit:
e7303626967ed721dd323a8a6ea6c638aed46c50
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add submodule tests
ok semarie
- Commit:
0208f208304c36921fbcd86d33751b877aab1e96
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show a list of paths changed in a commit with 'got log -P', and in tog
requested by matthieu@
- Commit:
2e8c69d19fae38dc738e3dfb02687b1503029a78
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix "no such entry found in tree" error with got log -p and an added path
ok millert@
- Commit:
50f2fadafa8ef856e1162b1ff4bff7e09adadd82
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix 'got log -r' loading refs from the wrong repo if invoked in a work tree
ok tracey
- Commit:
b90c30485ccda2a8a4950134cedef294b4e8e18e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
adjust expected "object not found" error output in tests