Commits
- Commit:
18877383a0d783b0b642a27b16ccd3d1a212c8a3- From:
- James Cook <falsifian@falsifian.org>
- Date:
fix option processing for 'got merge'
Don't make -C imply -c (a break statement was missing). Detect -an and
-cn conflicts. Simplify by removing unneeded check for conflicting -aC
(since -C requires -c, we can rely on the -ac conflict being detected).
Update the man page to say -cC is allowed.
- 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:
9628f36dac5ed5319b482a020f06ff9737a0c1f0- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got tree /' succeed in a work tree
Previously, this command would trigger an error: got: /: bad path
- Commit:
4448825ab554378228429f5ac53c9cf943cc2503- From:
- Omar Polo <op@omarpolo.com>
- Date:
dropping unnecessary strlen()s
ok jamsek, stsp
- Commit:
39c864a48b9d156c8b748725f5f89b3bd3f65038- From:
- Omar Polo <op@omarpolo.com>
- Date:
avoid strlen in for(;;)
ok jamsek, stsp
- Commit:
563ffc1b6d823b71bab79a0a75c67524f3d0f447- From:
- Omar Polo <op@omarpolo.com>
- Date:
got, tog: correctly skip HEAD in build_refs_str()
s[strlen(s)] == '\0' is banally always true, the intent was to not skip
refs that starts with "HEAD".
style nit / ok stsp@
- Commit:
c6119c6d1145977d2ae8fb6754a9c369731d8dec- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got status' error out as intended when invoked in a repository
- 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:
ad575c3a0f6a3c278002356c0a2cf0142cf1177a- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Stefan Sperling <stsp@stsp.name>
- Date:
simplify ancestry checks in checkout, update, rebase, and merge
No behaviour change as the end result of the rewritten checks should
be the same as before. We are just doing less work where possible.
Patch by James Cook
- Commit:
bfcdc9e9816dc81c90ce2db28ad9b602ec06b95a- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got patch' display statistics about files with conflicts and rejects
ok op@
- Commit:
8cdd231889a848b735f84ed6772eab46c2512db9- From:
- Omar Polo <op@omarpolo.com>
- Date:
got: flush stdout before printing the error in main()
Since standard error is unbuffered, it could happen that the error
string is printed immediately while the output from the subcommand
is stuck in a buffer and written later. So flush() standard output
before printing the error message.
Problem reported by naddy@, ok stsp@