Commits
- 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:
a4515c6608c1b685bfa9187b2517b44773a11068
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
got: drop commit -A $GOT_AUTHOR restriction
As discussed with op and stsp on irc, this prevents the valid case of
changing a commit's author to yourself during a histedit operation, and
potentially blocks other valid use cases too.
ok stsp@ and op@
- Commit:
b584caa3e8756aeac18e4d5b3c63cdc8b17ad9ea
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
show worktree UUID in backout/cherrypick -l output
When run from the repository, display the UUID to help the user know which
logmsg refs belong to which work tree. Also, use "backout" or "cherrypick"
in the log message header to distinguish output from 'got log'.
Suggested by stsp on irc.
ok stsp@
- Commit:
def2bea2b9b5f351896e4af5c7ff6a59a1b537c9
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
regress: commit coverage for the new logmsg ref feature
This tests we correctly:
- use multiple logmsg refs in one commit;
- use only relevant refs involving affected paths;
- use refs when some of the affected paths are reverted;
- neither use nor remove refs if all affected paths are omitted
from the commit;
- use refs when previously excluded paths are later committed.
- remove corresponding temp merged_log 'got-logmsg-*' files
hints and ok stsp@
- Commit:
21f077265038a0c30c857035d2ab286f293573b1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
require space between commit author name and email, for Git compatibility
Allowing such author fields breaks 'got send' towards Github for affected
commits because git-index-pack --strict will error out on the server:
$ git index-pack --strict pack-de791fb6a3a1961e44ac5d98d72fd533bf9277c8.pack
error: object 5d6bde9eaaf27f41ae8fa7112bb45e489d3c16b9: missingSpaceBeforeEmail:
invalid author/committer line - missing space before email
fatal: fsck error in packed object
problem encountered by landry@
ok op@
- 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:
4ba2e95571e317867b5ed45cb6c8580a33627500
- From:
- Stefan Hagen <sh+got@codevoid.de>
- Date:
got: don't search through ignored paths and files on commit
- 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:
62b21d332b3a92a7f99022d68bc8fd98a4682d33
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got commit: add flag to specify the author
This adds a new flag, `got commit -A', that allows to specify the commit
author but retains the "committer" (which is obtained as usual via
GOT_AUTHOR, got.conf or git config.)
with lots of help from and ok stsp
- Commit:
cf208ddd0ee1b6c232ef38bc307e689bc2b4653b
- From:
- Omar Polo <op@omarpolo.com>
- Date:
fix email address parsing
we were both too strict and too lose. To avoid breaking got object
parser (and to some extent ours too) we need to ensure that there aren't
any line feeds, extra < or > and no trailing gibberish. The '@' is not
actually required in the email.
various tweaks and ok stsp
- Commit:
230e1f1bfa1d7bbd0dee0217e22bc2817e848ad0
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
regress: use bs=1M for dd, not bs=1m; fixes -portable test failure on ubuntu
GNU dd only accepts upper-case letters for the size units.
- 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:
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:
1d918cf99eb38998939247bea7f749f199390dc3
- From:
- Omar Polo <op@omarpolo.com>
- Date:
improve error message due to malformed `author' in got.conf
tweak and ok stsp@
- Commit:
72840534edfc1ffa7aafa0ce0ab42568c8ec7145
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
compress delta data from delta_cache directly into pack file
- Commit:
4f3c844beaeb6a0b30565833e0481b8de9a5106e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got update' display the worktree's branch name upon success
ok tracey
- Commit:
3a6b87604592c583079227ea995f50eb3ec74121
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
use the POSIX-compliant "date -u" command to return UTC time; ok stsp
- Commit:
a96621150027f46d946238e99c8236a06f79f0da
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
add missing "return 1" to failure handling in the regress scripts
ok stsp@
- Commit:
8e09a16893e9f1d76a82e99d79fbceaabb6f4bd0
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
fix hang in commit regress test. ok stsp
- Commit:
28cf319f780087bba863715f31d4ec417eb87a6d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add 'got commit -F' option to commit with a log message stored in a file
To avoid accidents commit -F opens the prepared log message in an editor
so it can be reviewed before the commit is created.
For non-interactive use the -N option is required in addition to -F.
ok millert@
- Commit:
54c39596938ae6d19fe5eede072d36a3f61baa12
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA
- Commit:
c8c7d149feda16fa5f471654738791b6e7f1af5e
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
expand arguments in shell script since brace expansion is not in POSIX
ok stsp
- Commit:
f6cae3ed1ef0c22150181eeebb8f9e97db99dc5a
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
switch function declarations from Korn shell to Bourne/POSIX shell syntax
ok stsp
- Commit:
50b0790ed9a28fced631f31e5b7ca76a9a610ea5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add per-worktree got.conf(5) file in the .got directory; ok millert
- Commit:
257add310e4b16ae43b467b91f66b773da39f470
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add got.conf(5) configuration file
ok tracey