|
de05890f
|
2020-03-05T10:53:53
|
|
fix histedit 'rebase commit ID mismatch' error when splitting a commit
Commit IDs on histedit's temporary branch can change arbitrarily because
the user may create new commits on this branch while editing past commits.
So there is no point in trying to verify these IDs like we do during rebase.
Add a test case which demonstrates the problem.
|
|
|
4cb8f8f3
|
2020-03-05T09:51:26
|
|
fix wrong use of words in a histedit error message
|
|
|
37486c75
|
2020-03-05T09:36:45
|
|
make our README file point at our website
|
|
|
4b6c9460
|
2020-03-05T08:41:12
|
|
be helpful when users try to check out work trees without a known branch
Provide a useful error message in such cases and explicitly document
intentional restrictions in the got(1) man page.
Prompted by a question from Adam Steen via bsd.network
https://bsd.network/@adams/103768951483318235
|
|
|
ee85c5e8
|
2020-02-29T11:13:12
|
|
map 'tog path' to 'tog log path' if possible; requested by mpi@
|
|
|
b8b3f209
|
2020-02-29T08:15:55
|
|
make got_path_is_root_dir() deal with an arbitrary amount of leading slashes
|
|
|
61a7d79f
|
2020-02-29T08:05:11
|
|
remove GOT_ERR_NOT_ABSPATH and fix existing users to deal with absolute paths
|
|
|
63f810e6
|
2020-02-29T07:54:55
|
|
when "bad path" errors occur, always show the path in question
|
|
|
a2f4a359
|
2020-02-28T19:37:37
|
|
properly free cmd_argv in tog's main() function
|
|
|
dfd6c250
|
2020-02-28T19:36:57
|
|
fix typo in comment; found by mpi@
|
|
|
a0ea4fc0
|
2020-02-28T17:37:53
|
|
show merged commit ID + logmsg upon merge conflict during rebase and histedit
This makes it more apparent which commit contained the conflicting change.
The new output looks like this:
C sys/dev/pci/if_iwm.c
8a98d848a1a5 -> merge conflict: properly modify station queues
got: conflicts must be resolved before rebasing can continue
|
|
|
272a1371
|
2020-02-28T17:32:05
|
|
don't leak logmsg in show_rebase_progress()
|
|
|
c10890ce
|
2020-02-25T13:32:18
|
|
in got.1, clarify that rebasing of branches with zero local changes is normal
|
|
|
5dd154fc
|
2020-02-25T12:59:17
|
|
bump version number
|
|
|
233f3602
|
2020-02-25T12:54:34
|
|
changes for 0.28
|
|
|
2b6826ba
|
2020-02-24T22:04:15
|
|
attempt to more clearly explain what 'got rebase' is used for
|
|
|
7ef62c4e
|
2020-02-24T21:31:31
|
|
disallow 'got rebase' while a histedit operation is in progress
|
|
|
65db4ffb
|
2020-02-24T21:22:56
|
|
document that 'got integrate' cannot be used during a histedit operation
|
|
|
ddbfac99
|
2020-02-24T21:12:49
|
|
document histedit's -F option
|
|
|
46fa4c83
|
2020-02-24T21:12:21
|
|
explain more clearly how a histedit script will be edited
|
|
|
6e54d307
|
2020-02-24T21:03:20
|
|
document more clearly what needs to be done to start a histedit operation
|
|
|
80106605
|
2020-02-24T20:31:09
|
|
switch 'got tag' commit argument to a -c option for consistency
|
|
|
da76fce2
|
2020-02-24T20:31:09
|
|
let 'got branch' switch and update the work tree
ok tracey
|
|
2bdefe56
|
2020-02-24T15:44:56
|
|
edit man page wording for histedit -m feature
|
|
212b39d1
|
2020-02-24T11:57:12
|
|
Sync the description of the -r flag from "tree" to the other commands.
Clarify that if the current directory is a work tree, tog will pick
the repository associated with this work tree by default.
ok stsp
|
|
|
083957f4
|
2020-02-24T09:50:06
|
|
add 'got histedit -m' option which makes it easy to edit log messages only
ok tracey
|
|
|
5b666081
|
2020-02-24T09:46:13
|
|
show how to log subdirectories in got.1 EXAMPLES
ok naddy
|
|
|
09b5bff8
|
2020-02-23T16:28:39
|
|
switch "tog diff" repository path argument to a new -r option
|
|
|
a273ac94
|
2020-02-23T16:28:39
|
|
fix "tog diff object1 object2" by actually extracting the repository path
from the work tree
|
|
|
dc990cbf
|
2020-02-22T20:42:55
|
|
document semantics of got log and tog log path arguments
|
|
|
ea025d1d
|
2020-02-22T20:29:17
|
|
add ^B/^F key bindings for page up/down in the "blame" and "tree" views
|
|
|
f70ffbb5
|
2020-02-22T12:44:08
|
|
disable compiler warnings in release builds because -Werror is bad for ports
sthen@ suggested to drop -Werror; I think we don't need any -W in release mode
|
|
|
54b1c5b5
|
2020-02-22T12:37:58
|
|
don't proceed if a bad imsg is received in recv_gitconfig_remotes()
|
|
|
d669b9c9
|
2020-02-22T12:37:12
|
|
fix uninitialized variablen recv_gitconfig_remotes; found by sthen@ with gcc8
|
|
|
32dfb4a2
|
2020-02-21T08:34:31
|
|
bump version number
|
|
|
1d2efe42
|
2020-02-21T08:28:20
|
|
changes for 0.27
|
|
|
72314d84
|
2020-02-21T08:24:04
|
|
sync distfile list
|
|
|
e5ac56af
|
2020-02-21T08:03:18
|
|
ensure that gotweb's libexec helpers inherit build flags set in parent dirs
|
|
|
7fa81f88
|
2020-02-21T01:06:03
|
|
allow 'got ref' to manipulate refs which do not have a slash in their name
|
|
|
6962eb72
|
2020-02-20T15:11:59
|
|
unify formatting of common code in tog log, blame, and tree
|
|
|
e4a0e26d
|
2020-02-20T15:08:56
|
|
prevent possible double-free introduced in previous commit
|
|
|
55cccc34
|
2020-02-20T14:58:02
|
|
add an optional path argument to 'tog tree'
|
|
|
f135c941
|
2020-02-20T14:58:02
|
|
use a common helper function to get the path from argv in tog log and blame
|
|
|
795c10a4
|
2020-02-20T13:39:19
|
|
initialize all missed kcgi_err enums. pointed out by kurt@
|
|
|
1a0f5bbd
|
2020-02-19T16:46:02
|
|
whitespace, remove unneeded jump
|
|
|
ff4bb25f
|
2020-02-19T16:37:13
|
|
add new tags page and ability to navigate all tags
|
|
|
cb1159f8
|
2020-02-19T13:41:31
|
|
fix misplaced tog search prompt in split-screen views
|
|
|
75f21c89
|
2020-02-18T21:42:37
|
|
reduce gw_index np_wrapper code to one if statement
|
|
|
bf4484a3
|
2020-02-18T21:24:33
|
|
work if someone sets got_max_commits_display to 1, and check prev_id
|
|
|
55e46400
|
2020-02-18T20:39:38
|
|
add navigation to gw_briefs and gw_commits, fix logic error in original limit checking
|
|
|
c2fe5481
|
2020-02-17T23:02:49
|
|
bump version number
|
|
|
f8e69f75
|
2020-02-17T22:58:46
|
|
changes for 0.26
|
|
|
246e910a
|
2020-02-17T22:57:34
|
|
fix gotweb build on sparc64; the old linker wants to see -lz after -lkcgi
|
|
|
faa61ea3
|
2020-02-17T22:39:39
|
|
make gotweb's install target respect DESTDIR for the devel/got port
|
|
|
bb63914a
|
2020-02-17T21:57:56
|
|
make tmp dir location a compile-time setting and change gotweb's tmp dir
We are not sure whether a gotweb package can own /var/www/tmp on OpenBSD.
Moving gotweb's tmp dir to /var/www/got/tmp sidesteps that issue.
|
|
|
fa44fa48
|
2020-02-17T20:48:35
|
|
remove needless file and folder parameters from blame's commit diff links
|
|
|
d90bcdd6
|
2020-02-17T20:42:02
|
|
improve error message when query contains an invalid repo name
|
|
|
97a19438
|
2020-02-17T20:34:40
|
|
got_ref_get_name() cannot fail
|
|
|
8f214b62
|
2020-02-17T20:34:27
|
|
don't use got_error_from_errno() in situations where errno was not set
|
|
|
c56af3fd
|
2020-02-17T20:24:04
|
|
add missing error check in gw_output_blob_buf()
|
|
|
bc8c6114
|
2020-02-17T17:30:29
|
|
free missed n_header refs
|
|
|
795c5bd7
|
2020-02-17T17:23:16
|
|
check for correct opendir
|
|
|
e227880d
|
2020-02-17T17:22:07
|
|
improve closedir error handling
|
|
|
8182bd34
|
2020-02-17T17:11:26
|
|
close potentially left open directory during an error condition
|
|
|
85993e64
|
2020-02-17T17:09:49
|
|
apply unveil earlier in gw_summary, instead of waiting on gw_briefs
|
|
|
66dc9065
|
2020-02-15T17:11:59
|
|
document the new search feature in tog's diff view
|
|
|
bf93a5c0
|
2020-02-15T16:35:04
|
|
handle commit briefs branch display in gw_briefs instead of gw_summary
|
|
|
1b33afc0
|
2020-02-14T23:48:52
|
|
improve gw_blame querystring checking. remove XXX comments, since repo_file is now checked before dumping blob
|
|
|
3b7fdcf4
|
2020-02-14T23:23:47
|
|
improve gw_blob querystring checking
|
|
|
9f33591a
|
2020-02-14T22:26:09
|
|
check required querystring commit exists for gw_tags
|
|
|
56997cd3
|
2020-02-14T22:19:41
|
|
rename commit to commit_id in gw_trans and fix setting gw_trans->commit_id from gw_index
leave comment explaining this
|
|
|
f9315db0
|
2020-02-14T22:07:17
|
|
initialize author and committer to prevent double free on error
|
|
|
deac617c
|
2020-02-14T21:49:11
|
|
where we can, use a single open repo object to reduce opening and closing a repo
|
|
|
3c245a0e
|
2020-02-14T21:01:29
|
|
further simplify objects carries around in struct gw_header
|
|
|
4e8d6e3e
|
2020-02-14T20:56:45
|
|
simplify getting commit header info and open and close in scope
discussed at length with stsp
|
|
|
1ae0a341
|
2020-02-14T15:43:03
|
|
add a test which ensures that 'got rebase' trims empty dirs from disk
|
|
|
2011c142
|
2020-02-14T11:19:43
|
|
simplify gw_get_repo_age() and close several resource leaks
|
|
|
7eb2c8df
|
2020-02-14T11:13:16
|
|
no need to dup refname in gw_output_repo_heads()
|
|
|
eb4f3ad3
|
2020-02-14T11:13:16
|
|
check for any symbolic refs and skip them, not just HEAD
|
|
|
17d4bf8d
|
2020-02-14T11:13:16
|
|
refname in gw_get_repo_age() doesn't need to be duplicated; simplify
|
|
|
742ba378
|
2020-02-14T10:50:54
|
|
there is no need to strdup() gw_trans->headref
|
|
|
122f3af5
|
2020-02-14T10:41:25
|
|
add missing error checks in gw_get_header()
|
|
|
a4c23852
|
2020-02-14T10:25:50
|
|
gotweb: decorate only the branch's tip commit ID with "(branch)"; add XXX
|
|
|
b0a1bc86
|
2020-02-14T10:05:22
|
|
gw_free_headers() frees just one gw_header so rename it to gw_free_header()
|
|
|
92786174
|
2020-02-14T09:48:39
|
|
make gotweb's summary page display which branch the commit briefs belong to
|
|
|
7ecc73af
|
2020-02-13T23:49:31
|
|
ensure we close the final checked dir in gw_load_got_path and use better error message
|
|
|
cc18a904
|
2020-02-13T23:40:43
|
|
catch invalid actions and git paths earlier in querystring parsing
|
|
|
6f6f771f
|
2020-02-13T23:28:37
|
|
set gw_err in correct code path
|
|
|
88759617
|
2020-02-13T22:25:33
|
|
remove free(refs_str) that was reintroduced with rebase
|
|
|
f1200fe3
|
2020-02-13T22:20:46
|
|
fixup initial action querystring error and use the err.tmpl finally
|
|
|
d81f9039
|
2020-02-13T20:49:27
|
|
jump to error handling consistently in gw_load_got_path()
|
|
|
a81394a7
|
2020-02-13T20:42:44
|
|
eliminate unnecessary strdup() via an intermediate variable in gw_get_commit()
|
|
|
53e81e48
|
2020-02-13T20:38:29
|
|
remove unneeded asprintf and clean up a couple of lines
|
|
|
5c65becf
|
2020-02-13T20:27:04
|
|
remove all usage of strdup("") and simply check for NULL instead
|
|
|
39fdad0d
|
2020-02-13T18:07:50
|
|
avoid strdup on author and committer
|
|
|
d1635ae4
|
2020-02-13T18:02:36
|
|
backout changes in a942aa37d2d222c183405af276d7bd07f9657398 and expand strdup error checking
|
|
|
64024486
|
2020-02-13T16:54:45
|
|
remove unnecessary etc directory from dist file list; noticed by tracey
|
|
|
4d6abe2b
|
2020-02-13T10:55:02
|
|
no need to deep-copy repo_file param from querystring; add some XXX comments
|
|
|
dda76f18
|
2020-02-13T10:52:18
|
|
add another XXX comment; I'm not quite sure what to do about this just yet
|
|
|
f652ec0c
|
2020-02-13T10:43:59
|
|
no need to deep-copy the repository name from the request; just point to it
|