Commits


replace "(cd path && git cmd)" with "git -C path cmd" This matches the existing use of "got -r path cmd" and "git_commit path args".


rename a few pop_id to pop_idx leftover from 79c49d8454.


regress: nix 'set -A' kshism from tests As reported by naddy, this is a non-portable Korn shell construct. Instead, use the one argument array then make faux space-delimited string "arrays" for the other ids; they can still be indexed with pop_idx. improved by + ok naddy@


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@


expand support for commit keywords to more got commands Add the ability to use keywords in the backout, branch, checkout, cherrypick, and patch commands. Includes some basic regress tests for the new commands, and also some more contrived test cases for 'got log -c[:]keyword[:(+|-)[N]]'. ok stsp


detect packed vs. on-disk reference collision when listing refs ok op@


don't pass $ret to test_done on failure when it's known to be zero Otherwise the test directory it's not left in place; ok tracey@


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.


make 'got update' display the worktree's branch name upon success ok tracey


allow deletion of refs/remotes/ branches with got branch -d Also, make requirements for branch name arguments more flexible. Absolute reference names are now accepted. ok naddy@


use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA


switch function declarations from Korn shell to Bourne/POSIX shell syntax ok stsp


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


let 'got branch' switch and update the work tree ok tracey


add -c option to 'got branch', replacing the optional second argument


make 'got branch' without args show work tree's branch; requested by benno@


fix deletion of branches stored in packed-refs broken since 29606af7a3a58767bf817a38035490899609d13e


allow creating branches based on commit IDs as well as other branch references


detect and prevent deletion of the work tree's current branch


fix a bug in 'got branch' and add tests for this command