Commits
- Commit:
99495ddb79841fe89b0746d35a49bb81e9220096
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a 'reference' directive to remote repositories in got.conf(5)
Make use of this in 'got clone' to persist -R option arguments given on
the command line in the cloned repository's got.conf(5) file.
- Commit:
0c8b29c50669cb8958428fbf923f02a5b69184db
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a 'fetch-all-branches' configuration setting to got.conf(5)
Set fetch-all-branches in the got.conf(5) file created by 'got clone -a'
in order to make a future 'got fetch' act like 'got fetch -a' by default.
- Commit:
132af4a5fe242aab94fc8049abfb80888c26395f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
store all branches passed via 'got clone -b' in got.conf(5) and git-config(1)
- Commit:
612392ee9a232ecb6f4f9db91eafbe6693509bd9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
allow the 'got fetch' -l option together with the -q option
Make use of this in tests to hide useless output from ssh(1).
- Commit:
15d3c221e34cad474e87c43111417186822c887c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got clone' pin the fetched branch in got.conf(5)
Avoids relying on the server-side HEAD ref by default during future fetches.
- Commit:
888b7d9932412e73b1d3887bc2d7208c37bc6f75
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make use of a reflist object id map in 'got log'
Impoves performance of 'got log' on the FreeBSD Git repo which can easily
contain more than 4000 references.
- Commit:
d9dff0e5c658f1bef8647522dcb5b851b3f4734e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
switch reflist to TAILQ; insert elements more efficiently for sorted input
ok naddy
- Commit:
84de91061b4d6cf5649efd5a42c4c3b90550332c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
Add a refs argument to got_repo_match_object_id(), replacing 'resolve_tags'
Make use of this where possible to avoid re-reading references from disk.
ok naddy
- Commit:
6059809a13b5d528052e38f84661039e6565f458
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use size_t for loop indices to avoid signedness warnings; by emaste@freebsd
Same change as 16aeacf7088d, for subdirectories other than lib/
- Commit:
0d5bb27670e5cdef181f8073984fd02be5a42d53
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
allow editing of log message comments with 'got histedit'
This makes it possible to remove just comment lines from log messages
during a histedit operation, leaving the rest of the log message as-is.
The behaviour of treating changes to comment lines as no-ops was coded
to prevent mistakes during 'got commit/import/tag', where the command
will error out if the log message template is not modified. This is not
appropriate for histedit because histedit is used to fix such mistakes.
ok millert@
- Commit:
71392a05f2ee999ddda39f6b5eb64d0bc292c0ce
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
prevent log message loss of folded commits during histedit
If the histedit log message editor exits without saving its buffer,
Got threw away log messages of all commits which were folded. Only the
last commit message is preserved, which could be something meaningless
like "fixup".
Instead, preserve the initial editor buffer content as-is.
That is not going to be an ideal log message, but doesn't throw away
information and stands out visually because the newly created log message
will start with a comment like '# log message of folded commit a0ff...'
Problem reported by jrick
- Commit:
b380533788adf056655d5bdf9d7e497e53c5d85f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
histedit -f conflicts with -F option
Also fixed as part of a different patch from jrick
ok jrick
- Commit:
ff69268e3d2a6d3adf3c7b6a1284fca5ac8fc62a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use a helper function to generate error messages for mutually exclusive options
Inspired by a different patch from jrick
ok jrick
- Commit:
466785b9264da1a24c92aed9d706e76cc826601d
- From:
- Josh Rickmar <jrick@companyzero.com>
- Date:
add histedit -f flag for folding shortcut
"please push it" stsp
- Commit:
64453f7e55c4c69b6cd08229929ed8227b789ff8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle binary files in got/tog diff commands; add -a options to force text
- Commit:
be659d10a8dd75e169fb7a246f54238dfc4386e8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix type of filesize output parameter of got_object_blob_dump_to_file()
- Commit:
8fa913ec61095de669c9ca40e3cd782d53c85bdc
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove now pointless 'check_disk' parameter of got_repo_map_path()
suggested by naddy
- Commit:
fe621944e83fe6367f7bff97128b4240a9cdc7c5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
merge new diff implementation from the git.gameoftrees.org diff.git repository
This new diff implementation was started by Neels Hofmeyr during the u2k20
hackathon and now replaces diffreg.c code lifted from the OpenBSD base system.
The integration of this code into Got was done by me.
Got now uses the patience diff algorithm by default.
The diff.git repository will remain the primary repository for the diff code,
which already compiles and runs on other operating systems such as Linux.
Any fixes and improvements for files inherited from the diff.git repository
should be written against that repository and synced to got.git afterwards.
- Commit:
4fedbf4c4e5ffc90d4eb6f38c58a4b9d927d896c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
avoid got_repo_map_path() in 'got tree' if a work tree is available
Note that got_worktree_resolve_path() will return a path based on
the current working directory if the argument is the empty string.
This quirk keeps the behaviour of 'got tree' intact which depends
on the current working directory if run in a work tree.
ok naddy@
- Commit:
017406073fd742cc052672dd2f2689838e76df3f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
avoid got_repo_map_path() in 'got blame'
'got blame' does not need access to the work tree. So far the work tree
was completely hidden with unveil(). We must now expose the work tree
while resolving the path, so unveil() calls are shuffled around slightly.
Failing realpath() calls would mess with path resolution otherwise.
There's a bug in got_worktree_resolve_path() where it failed to canonicalize
a path constructed from a user-specified path that does not exist on disk.
Note that this path falls into strncmp() a few lines down. I am fixing this
by adding canonicalization. Generally, joining paths with asprintf() and
comparing paths with strncmp() is fragile. A more general solution might be
needed but I am leaving that for another day.
ok naddy
- Commit:
7f9bfb3188bd9d77317f3205b61e96c7a55b005a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
replace resolve_commit_arg() helper in got.c with got_repo_match_object_id()
- Commit:
579bd556f987d6059cca7f20219140dae23079f3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
prevent a NULL dereference if 'got log -p' runs against a root commit
- Commit:
603cdeb0c7bcddc1abea9ced622f6eaa82c00f35
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got log' avoid got_repo_map_path() if run in a work tree
ok naddy
- Commit:
62d463cac1fd99c423acb07c0367c649724a2a9a
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
indentation fixes
- Commit:
54eb00d5beb979ca755db29889d236201e53cd52
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
properly handle nonexistent remote repository names given to 'got fetch'
found by jrick
ok naddy