op public repos

Commits

Commit:: f4ab0e5770b96257cb1a43cfe292daa54f2b402e
From:: Stefan Sperling <stsp@stsp.name>
Date:: Thu Mar 28 14:35:03 2024 UTC

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@

diff | patch | tree

Commit:: f73bf5bd9e54af999a744c731dfb492e1c9b2b6d
From:: Christian Weisgerber <naddy@mips.inka.de>
Date:: Sun Oct 1 22:50:43 2023 UTC

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".

diff | patch | tree

Commit:: 481cdc746b012203f39047cbc55f8b65ae40d046
From:: James Cook <falsifian@falsifian.org>
Date:: Sat Jul 1 13:13:02 2023 UTC

add -M option: tell got merge not to fast-forward ok stsp@

diff | patch | tree

Commit:: f25e229e88a01c4a65fa80f4d5e35cd34309cbf9
From:: Stefan Sperling <stsp@stsp.name>
Date:: Thu Jun 22 15:15:11 2023 UTC

reword user-facing error message which mentions "fast-forward" For user-facing messages it is better to avoid technical jargon like this and instead spell out what the fast-forward situation implies: that one branch is already based on another. ok jamsek

diff | patch | tree

Commit:: 1334230721068ac62f5ea69c359962cdedb4df60
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Jun 21 15:34:33 2023 UTC

prevent 'got merge' from creating commits on branches outside of "refs/heads/" ok op, james

diff | patch | tree

Commit:: 179f9db092046395efaa1dc9e767a1ec109e1174
From:: James Cook <falsifian@falsifian.org>
Date:: Tue Jun 20 13:49:35 2023 UTC

Implement fast-forward merges. Split part of got_worktree_merge_prepare into a new function, got_worktree_merge_write_refs, since that part doesn't make sense in the fast-forward case. ok stsp@

diff | patch | tree

Commit:: ea4ee74a619549cdfbbf7f824599834f31b72838
From:: James Cook <falsifian@falsifian.org>
Via:: Omar Polo <op@omarpolo.com>
Date:: Sat Jun 17 21:52:26 2023 UTC

regress/cmdline: fix handling of unexpected success Diff from James Cook, thanks!

diff | patch | tree

Commit:: 6b5246e4d4f6c6cbd079a43d14042d998fbc902f
From:: James Cook <falsifian@falsifian.org>
Via:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Jun 5 08:14:56 2023 UTC

make 'got merge -c' fail even if new changes only affect unrelated paths Otherwise, 'got merge -c' can silently revert already committed changes. Also fix GOT_ERR_MERGE_COMMIT_OUT_OF_DATE by giving it a value distinct from GOT_ERR_MERGE_STAGED_PATHS. Patch by James Cook

diff | patch | tree

Commit:: 427615296bc79cda685540d7fc241444b7447980
From:: James Cook <falsifian@falsifian.org>
Via:: Stefan Sperling <stsp@stsp.name>
Date:: Thu Jun 1 07:34:20 2023 UTC

make "got merge" refuse to run if a merge is in progress and the -a or -c option wasn't passed. Patch by James Cook.

diff | patch | tree

Commit:: 35d2583f834a66f801dc229002d45e735882ba78
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Apr 17 15:53:19 2023 UTC

allow no-op merge commits to be created Requested by James Cook

diff | patch | tree

Commit:: af179be739cacd6576fdf9596ac7e61b714ee367
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Apr 14 12:15:45 2023 UTC

when aborting rebase/histedit/merge, unlink files added by merged changes Otherwise we leave unversioned files behind in the work tree which may interfere with new attempts to rebase or merge the changes again. Problem found by + ok naddy@

diff | patch | tree

Commit:: d51d11be9ba86c2c5cf8d36994e56eeccb905865
From:: Omar Polo <op@omarpolo.com>
Date:: Tue Feb 21 10:33:09 2023 UTC

fix 'got merge' so it parses gitconfig for author cmd_merge is the only subcommand that may create commits that doesn't parse the git config files, thusly failing for users without GOT_AUTHOR defined. Problem reported by James Cook who also provided an initial test case, thanks! ok jamsek

diff | patch | tree

Commit:: b2b3fce13e4eca588bb28a869b07f0063568b505
From:: Omar Polo <op@omarpolo.com>
Date:: Sat Oct 29 18:22:42 2022 UTC

respect umask when creating or changing files and directories This behaviour is already documented in got-worktree(5) but wasn't actually implemented. ok stsp@

diff | patch | tree

Commit:: 5e91dae4dd43b8024731223110ab18f505f453ac
From:: Josiah Frentsos <jfrent@tilde.team>
Via:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Aug 30 16:02:06 2022 UTC

remove trailing whitespace; patch by Josiah Frentsos

diff | patch | tree

Commit:: 49c543a6fe888394ca86e6399c706a9965486134
From:: Christian Weisgerber <naddy@mips.inka.de>
Date:: Thu Mar 31 20:41:38 2022 UTC

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.

diff | patch | tree