Commits
- Commit:
b40793acff6223f04e5b673fa5c6d488f7b617ea
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
always report stat() error with path
ok stsp
- Commit:
ff8a85aa6ea1444ad8a60d93ebc05d68c614d9d5
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
plug got_object_id leak in cmd_log()
ok stsp@
- Commit:
dcd455ee64953215a90ed4427762b5566d7e0047
- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Thomas Adam <thomas@xteddy.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:
31009ade0db15d36e637f180ba64b28110b25208
- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add -M option: tell got merge not to fast-forward
ok stsp@
- Commit:
0619bbce0ebd152fcabc1d9f49833c37137918df
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
4434a15a4719fdf3ae54026f89dc2c9fc8692d16
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
prevent 'got merge' from creating commits on branches outside of "refs/heads/"
ok op, james
- Commit:
2b72f32d6817b003f88452592f304c2e114617be
- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Thomas Adam <thomas@xteddy.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:
9fecc8d045c7fbacd561ecfc5a39f8e163299496
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got tree /' succeed in a work tree
Previously, this command would trigger an error: got: /: bad path
- Commit:
102d840de78061d9f313aaa557ef64f586932143
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
dropping unnecessary strlen()s
ok jamsek, stsp
- Commit:
9e26f05792286fa1ff16e43516f1f4a688b672b9
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
avoid strlen in for(;;)
ok jamsek, stsp
- Commit:
081e3dc235439cbb3e34342349768119ddf4ad49
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
a914c6bf9a936469678bf7398b2a02bfc4107d75
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got status' error out as intended when invoked in a repository
- Commit:
fe3f264bd2e2cae213952619831d4719dd6d1f11
- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
d8a7bd7ded08798e7d38e6706fbc540edce788f6
- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
a4c8ed779e07ca691ec6ad2651d059dc673403bc
- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
1faec3fb1acea5d3cb89b1e0ae2eeddb84cda4b9
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got patch' display statistics about files with conflicts and rejects
ok op@
- Commit:
4d0b6596a3fd608f26c1ff6c5e445601160ba99f
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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@
- Commit:
e9e7947043acbb1cb2962a4d2361c95af3dfe3b4
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
consistently close the struct repository on every cmd_*()
Spotted while looking for leaks using Otto' malloc() new leaks
detection. Harmless in practice since we just forgot to call
got_repo_close() when terminating in some cmd_*() functions, but
still a leak.
ok stsp@
- Commit:
664d70035d306f09fe381da2dfaa725623c9e252
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix crash in got log due to NULL-deref in got_object_blob_close
Reported by Mikhail (thanks!), ok jamsek
- Commit:
67fdb8a7a3ab501b2155b04b10e69e61779662b9
- From:
- Todd C. Miller <Todd.Miller@sudo.ws>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
Close the message template file before calling edit_logmsg().
Fixes a race condition on NFS where the file's modify time may
change while the file is being edited, causing the editor to complain.
OK stsp
- Commit:
4fccd2fe0ffbbc668b66abe63614470635f92f1b
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: configure: split out dependencies
Rather than assume all dependencies are required for all programs, split
them out.
This will make packaging easier, as well as splitting the code to use
subprojects.
Note that due to the use of config.h semantics, in most cases the
got_compat.h header file is now at the top of the .c file it is included
in, so that it can handle the system header inclusion properly.
- Commit:
5bedd79b0a5ac6601216ed43d3b71bd038c7e563
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
histedit_parse_list: avoid needless free(line)
getline(3) allows to safely re-use the storage.
While here rename `size' to `linesize', `len' to `linelen', and properly
initialize `linesize' to zero; suggested by tb@
ok tb@
- Commit:
f8da67e8340977371b6ec3114502ae8baa5dee1f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fall back to vi(1) instead of ed(1) if neither EDITOR nor VISUAL are set
ed users are reading files with their minds rather then their eyes, and
might therefore be missing important visual clues we write into files
before the user gets to edit them. Use of vi(1) ensures that such clues
will not be missed.
- Commit:
98670ba726486c39efff220ab1e074c62023aae7
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: rework SHA detection
Simply the SHA detection by not predicating on libcrypto, but instead
checking individual header files.
- Commit:
4680f704353811c8bb6ce65eac3714d1bd200c26
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: remove sha1.h; found portably
Remove sha1.h as this is found portably across systems.