Commits
- Commit:
f73bf5bd9e54af999a744c731dfb492e1c9b2b6d
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
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".
- Commit:
481cdc746b012203f39047cbc55f8b65ae40d046
- From:
- James Cook <falsifian@falsifian.org>
- Date:
add -M option: tell got merge not to fast-forward
ok stsp@
- Commit:
f25e229e88a01c4a65fa80f4d5e35cd34309cbf9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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
- Commit:
1334230721068ac62f5ea69c359962cdedb4df60
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
prevent 'got merge' from creating commits on branches outside of "refs/heads/"
ok op, james
- Commit:
179f9db092046395efaa1dc9e767a1ec109e1174
- From:
- James Cook <falsifian@falsifian.org>
- Date:
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@
- Commit:
ea4ee74a619549cdfbbf7f824599834f31b72838
- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Omar Polo <op@omarpolo.com>
- Date:
regress/cmdline: fix handling of unexpected success
Diff from James Cook, thanks!
- Commit:
6b5246e4d4f6c6cbd079a43d14042d998fbc902f
- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Stefan Sperling <stsp@stsp.name>
- Date:
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
- Commit:
427615296bc79cda685540d7fc241444b7447980
- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Stefan Sperling <stsp@stsp.name>
- Date:
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.
- Commit:
35d2583f834a66f801dc229002d45e735882ba78
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
allow no-op merge commits to be created
Requested by James Cook
- Commit:
af179be739cacd6576fdf9596ac7e61b714ee367
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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@
- Commit:
d51d11be9ba86c2c5cf8d36994e56eeccb905865
- From:
- Omar Polo <op@omarpolo.com>
- Date:
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
- Commit:
b2b3fce13e4eca588bb28a869b07f0063568b505
- From:
- Omar Polo <op@omarpolo.com>
- Date:
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@
- Commit:
5e91dae4dd43b8024731223110ab18f505f453ac
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove trailing whitespace; patch by Josiah Frentsos
- 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:
10b394ac1c027dbd5663bfa1269707d1f8930f3e
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
regress: make merge.sh more POSIXy
Don't use '==' for equality matching in sh, as this won't work across
all shells.
ok @naddy