Commits
- Commit:
748c56414eacb7da522137c3ddb35c23e46d526e
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move comment
it describes bump_base_commit_id_everywhere, not its per-entry callback
bump_base_commit_id.
- Commit:
f08f28be8b51ef7b0fba91edf90b81330031fc35
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
zap unused parameter in got_worktree_rebase_complete()
ok stsp@
- Commit:
630fc61f66dc259068303613f6f3cfc39f1d267f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix histedit -m on a commit which only changes filemode bits
The commit was being miscategorized as a no-op change and dropped.
Now the commit is retained and its log message is updated as expected.
ok op, jamsek
- Commit:
f6cd0243250112471da1212a1549007367cc32a7
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: load editor with backout/cherrypick commit log messages
Create new logmsg references used to populate the editor with the log messages
of backed-out and cherrypicked commits when 'got commit' is run. We use
versioned path state heuristics during revert and commit commands in an effort
to ensure the editor is only populated with the log messages of backed-out
and/or cherrypicked commits involving paths with local changes that are being
committed. This is an implementation of an initial idea and algorithm designed
by stsp.
inputs, improvments and ok stsp@
- Commit:
be97ab03efd83aac37b83f2df2dea936213b456c
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
refactor got log -d and tog diffstat to compute diff once
This eliminates the previous performance cost by making 'got log -d' and tog
diff view compute the diffstat while building the diff in a temp file like we
do with 'got diff -d'. Also, keep the current 'got log -d' UI as per stsp's
suggestion.
ok stsp@
- Commit:
48a59395643b13d6ebd067b1e4fcb8b5b373db1f
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
typo: pass rejectfile--not outfile--to got_ferror()
ok stsp@
- Commit:
21c2d8be42605670e7037d011fea06c5efd5f725
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: minor refactor of got_pathlist_free() API
Accept flag parameter to optionally specify which pointers to free. This saves
callers looping through the list to free pointers.
ok + fix stsp@
- Commit:
53d03f970a594ed205147f847c825c9b4752c3fd
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: expand diffstat -d option to 'got diff'
Like got log -d, add the switch to 'got diff' to display a diffstat of changes;
as per stsp's suggestion, we always include diff output with the diffstat.
Disabled in gotwebd (for now :) Includes tweaks from op@
ok stsp@
- Commit:
9e1ed038df33a34e2252ef41388131de3e09f6eb
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
do not hint at empty temporary diff files in the log message buffer
ok op@
- Commit:
d259e49165acf62d0ffddd9f1cd35a3608783ccf
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
ensure that files are in a state where a diff can be created, before diffing
ok op@
- Commit:
b5bedbbb00134c51ea21a700b6da9ab45c6e432e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
use a global flag instead of a per-file flag to detect staged changes
ok op@
- Commit:
fc2a50f28951c340fb573e7fcb0646ddf93fde8f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
use mkstemps(3) instead of mkstemp(3) for opening named temporary files
Allows 'got commit' to use a ".diff" suffix for temporary diff files.
ok op@
- Commit:
ef899790595636e3d4729e14971ad2843156dba9
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
provide a diff of changes in a temp file while editing a commit log message
ok landry@
- Commit:
a2c162ebaea11f9bd1d46c4cdf5b8f488ebaf58f
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
e6b88e161ad828106984b234e87b11f46df49a53
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
check for unlink(2) errors with the == -1 idiom, rather than != 0
ok op@
- Commit:
43896ae629e895c4f9fda63d34496408db649225
- From:
- Stefan Hagen <sh+got@codevoid.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: don't search through ignored paths and files on commit
- Commit:
b6b86fd1b9828e38d59915e62fddce62952b8b75
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
remove trailing whitespace; patch by Josiah Frentsos
- 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:
892eab0a82532775a97ff23efda990ad80d35896
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
call time(3) just once in commit_worktree(), not twice
- Commit:
9e39ca77238c1ce717f8ccb3c0ffc8e229cd1850
- From:
- Florian Obser <florian@narrans.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
path_got is unused and never assigned, no need to free it
OK stsp
- Commit:
3521b46649a4794366372744129e4e9d171d344f
- From:
- Florian Obser <florian@narrans.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
Do not ignore I/O errors.
Found by llvm's scan-build (dead store).
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:
25ec70067dea51a3c3ffd3c5f989853d80b847f7
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
switch 'tog diff' and 'tog blame' to Myers diff for speed
Make the choice of diff algorithm configurable by diff API users.
The got and gotweb programs keep using Patience diffs which are
prettier than Myers. But tog should be as fast as possible since
it is being used interactively. If performance of Patience diff
gets improved later we can consider switching tog back over to it.
ok tracey jamsek
- Commit:
dd2e2f52c1fb7a85d2d76afc68cec1175bbd52bd
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move more opentemp out of diffreg.c
ok tracey