Commits
- Commit:
9c177e8d04414b7be4a02d64ed06dcc402a7b0a8
- From:
- Omar Polo <op@omarpolo.com>
- Date:
use a define for vi(1) path
This is intended to aid -portable, since other systems may have vi
installed in a different place, or maybe prefer to ship with a
different default editor.
ok stsp@
- Commit:
d0bb0ed648b2dd60e628937450cbaf9200beb9a6
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
plug got checkout and update worktree leaks spotted by op@
- Commit:
8f74b4995a14ceab9270fcd22a5c1ca34c5cc3be
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
plug got status worktree leak found by Kyle Ackerman; ok op@
- Commit:
14eb0fefd04d63b1a8d626e72c953a811a403f7d
- From:
- "Lorenz (xha)" <me@xha.li>
- Via:
- Stefan Sperling <stsp@stsp.name>
- Date:
simplify usage of the 'mesg' histedit script command
The 'mesg' script command now requires a commit ID as its argument,
rather than being tied to a preceding 'pick' or 'edit' command.
The old model was too confusing for new users, in particular for people
used to Git's rebase -i squash semantics.
The 'mesg' command is now semantically equivalent to the 'pick' command
and additionally opens the log message in an editor.
The new syntax is simpler to use but also requires that we drop support
for one-line log messages inside the histedit script, with a commit ID
taking its place in the argument space. We don't believe this feature was
used much, and that a simplified usage model is more beneficial overall.
Patch by Lorenz (xha)
ok jamsek
- Commit:
db82695e31945b3ce001a5fb69674c3638622368
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
copy remote repo info out of work tree data before closing the work tree
Fixes a crash regression introduced when fetch/send were made to close
the work tree earlier.
- Commit:
48d13ac6dbfcb3d6edc18b5d373009c0cec558fa
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got fetch' and 'got send' release the work tree lock earlier
This avoids having work tree operations blocked while network transfers
are in progress.
ok op@
- Commit:
692a4bb1222d6b7c94768d7305a2178a15b05887
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
prevent overlapping repo and work tree in 'got checkout'
Some people are eager to try to make Got work just like Git by overlaying
the repository and work tree. This causes problems with unveil conflicts
at run-time.
Fail as early as possible during 'got checkout' when users attempt this.
cosmetic tweaks + ok op@
- Commit:
07d8d6083dc8bd84b2c7ca96068ce3c35f8c1dbf
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
fix 'got log -dPp' diffstat duplication bug
Only collect changed paths once if both -d and -P are specified;
we already checked for -d and -p. Reported by Lucas on IRC.
Regress for this and the previous (got log -x keyword) commit still due.
ok stsp@ and op@
- Commit:
93c250cd168c2e1d2f9997774c87cc2718373404
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
got: allow 'got log -x' to accept keywords
Suggested by Lucas on IRC.
ok stsp@ and op@
- Commit:
996fba9b2127b5170b74da3dcdf8eabc7a5f8985
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
zap unused got_commit_object var; ok op@
- Commit:
cdbfe5d2325bd7ae7a197ce5e7a93fcdba9097cb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add cancellation support to the mixed-commits checker in worktree.c
- Commit:
f47e2be5099a39b598f7b96d26b4fa08fdb62374
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
plug got_reference leak in cmd_update()
ok op@
- Commit:
863cc633e270c0edf587982ac9faccf7bb28f339
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
got: improve reporting accuracy in branch listing output
As suggested by stsp, show the out-of-date symbol for the work tree branch if
it is not only out of date in relation to the branch tip but also if it
contains mixed commits. Update regress and add new test to check for this case.
Also, explain the mixed commit condition of * and ~ markers denoting work
tree state in got(1) branch -l docs.
ok stsp@
- Commit:
df6221c7df42758252c508006201c3f66e6ae831
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use a separate .cvg meta data directory for cvg(1) work trees
This prevents mixing the use of got and cvg clients in the same work tree.
Avoids confusion going forward while cvg differentiates itself further.
tog(1) and gotadmin(1) remain compatible with both work tree formats.
These tools only read work trees to locate the corresponding repository.
- Commit:
4390d6c167c321d53ad289366248325c8e0bfcf5
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
got: enable more commands to accept commit keywords
More work adding commit keyword support to the blame, cat, ref, tag, and tree
commands. With this, all Got commands that take a <commit> option argument
or operand now support keywords. Regress flub saved by op!
fixes + ok op@