Commits
- Commit:
7d8bcb99cc69666c8317a8c1cadc8dc5885a7a77
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got patch: add -c flag to apply at a specified commit
it's useful for e.g. to apply old patches that weren't generated by `got
diff' or git-diff(1) and so lacks the metadata needed for the 3-way
merge.
manpage improvements from and ok stsp@
- Commit:
7224234d05a484296e83f2c66dcfce87ab931cad
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
`got patch' pledge early
ok stsp@
- Commit:
aec48c6cc2cd132e59d0286d87f2b3377d62eb93
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got patch: error if patchfile isn't a regular file
`got patch' cannot read patches from non-regular files for obvious
reasons. However, it could crash in sendmsg because pledge doesn't
allow to send file descriptors referring to directories. So, restrict
`got patch' to operate on regular files only and fail otherwise.
This still allows to read patches from symlinks since they're resolved
at open(2) time and the file type check is performed after.
There may be a marginal usefullness in reading patches from fifos, but
the current code doesn't allow that anyway since got-read-patch needs a
seekable file descriptor anyway.
ok tracey@
- Commit:
33f9ea25c71c18df082c187e2ada3d3f288b912d
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
tweak cmd_info; no functional changes intended
* don't allocate unused pack_fds
* drop wpath, cpath, proc, exec and sendfd pledge promises
* close the worktree
ok stsp@
- Commit:
cae49de0a80da9ab02ce855debdd56fb0be36400
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got histedit' fetch author info from Git configuration as a fallback
- Commit:
8db00f97570360c732c5c8b9ab0f0415e74184c0
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
do not require local author info during 'got rebase'
My commit to reset committer info during rebase was too strict
in some use cases. Even when simply forwarding a branch the rebase
operation could now fail if GOT_AUTHOR is not set.
To fix this, fall back on existing commiter information if no author
is configured. And try to obtain author info from Git config in case
GOT_AUTHOR is not set.
Problems reported by Mikhail.
- Commit:
150d7275caef04226a9f0c82b7b6c7ac62cfab0e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
reset committer during rebase and histedit
ok op@
- Commit:
0ee22038e37ccc4b67297627b9084eac852e46c2
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
do not forget to free(cwd) at the end of cmd_rebase() and cmd_histedit()
- Commit:
81d5d80e4c68d79d6443f65602599ae708caf4c1
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix wrong error return in cmd_commit()
- Commit:
d9cf08d99b88780ca686a001c3f6662da136829e
- From:
- Florian Obser <florian@narrans.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
We don't care about the length of the read line.
Found by llvm's scan-build (dead store).
OK stsp
- Commit:
c80a2e6597f8d0d1008532a2df3aa135ccbca96a
- From:
- Florian Obser <florian@narrans.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
Dot not ignore error from got_object_id_str().
Found by llvm's scan-build (dead store).
OK stsp
- Commit:
b0af9d3914556f9c9e9596bf31f6a601666c0b68
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
typo in cat_commit
otherwise prints the author instead of the committer
- Commit:
18d1acaddba2a6012509c2de642867984e27dbf4
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got commit: add flag to specify the author
This adds a new flag, `got commit -A', that allows to specify the commit
author but retains the "committer" (which is obtained as usual via
GOT_AUTHOR, got.conf or git config.)
with lots of help from and ok stsp
- Commit:
ec9b5f0bbac26b3fa439f7fe48c4bdf066545911
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix email address parsing
we were both too strict and too lose. To avoid breaking got object
parser (and to some extent ours too) we need to ensure that there aren't
any line feeds, extra < or > and no trailing gibberish. The '@' is not
actually required in the email.
various tweaks and ok stsp
- Commit:
8b925c6ccd3968917253ea191906a1710c40ed2d
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: add back sys/queue.h
Now that the handling of including sys/queue.h is better, there's no
need to remove those lines from the source. Copy the location of those
original sys/queue.h lines from upstream at the same line number, so as
to avoid any conflicts in the future.
- Commit:
8ea72c47a2077c52fad27872183808829d76c4d8
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
histedit: make sure mesg is only used after pick or edit
It doesn't really make sense to use mesg after a fold or drop, or after
another mesg. it currently "works" as intended, but the behaviour is
confusing and not useful, better abort the operation as it's probably
not what the user intended.
Suggested by and ok stsp@
- Commit:
ffcfe569470b9a24db65cf13a33fb059d17752a2
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got tag -V is like tag -l with verification, fix option-conflicts accordingly
- Commit:
ff5e1f096349d36a0ba772c0d78a21b2ab54e060
- From:
- Josh Rickmar <jrick@zettaport.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add signer_id option to got.conf(5)
Setting this option will cause 'got tag' to sign all created tags using
the SSH key, unless overridden by the -s flag.
ok stsp@
- Commit:
27b10c3cfd1526a6dd9f8101b12531a99b3411e4
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move 'got init' command to 'gotadmin init'
This functionality is better suited for gotadmin because it is
technically a server-side repository operation when we consider
the 'got' tool as the client-side tool.
I have plans to move 'got import' into gotadmin as well.
ok op@
- Commit:
ac669181b8f761add16dd4b87b7b1b3ffeef6cb6
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: remove sys/queue.h
This is included portably.
- Commit:
d06b35068bde5f1c8e4886142560fa256e197833
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
include system headers required for got_date.h directly, not indirectly
- Commit:
f4178df2ddc499004ba71a1c3f00b032712e12b2
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add -V option to 'got tag' usage string, and replace underscore with a hyphen
- Commit:
f7a23baba805288dfe0cbcd8184a71f947591683
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add option-conflict handling for 'got tag' -s and -V options
- Commit:
0141ae45ce4657625b86e5c2619ec279d6245d3e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add -v option to 'got tag' usage string
- Commit:
60cf507132c154811cbfda9500ad13d24c6edd88
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got tag -V is like tag -l with verification, fix option-conflicts accordingly