Commits
- Commit:
123836732402b1204e5be68f98a69084285c316d
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
add ci/he/mg/rb -C option to commit unresolved conflicts
As per stsp's suggestion and building on his initial diff, add the -C option
to enable creating commits with unresolved conflicts to the commit, histedit,
merge, and rebase commands to allow continuing the operation despite files in
conflict status. Also, only search for conflict markers in newly added lines
to enable working with files already under version control that may have
conflict markers embedded verbatim.
lots of tweaks, improvements, and initial diff + ok stsp@
- Commit:
f990756a3987ba6410baf611d561e9b8f285f047
- From:
- Omar Polo <op@omarpolo.com>
- Date:
use SHA1_DIGEST_LENGTH instead of sizeof(id)
ok stsp
- Commit:
bf1c78e5100932aa445b8ef07ebf9b712500c67e
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
update regress for fetch tweaks added in previous commit
ok stsp@
- Commit:
118a625d39930284f891ea1285efc17fb3848cae
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
got: further fetch tweaks to prevent unintended fetches
Implement stsp's suggestion to only fetch remote's HEAD if the symref
refs/remote/*/HEAD exists, and its target no longer matches the remote
HEAD. This ensures users tracking a project won't miss a change in HEAD,
while also fixing the issue reported by naddy where HEAD was fetched by
default even though a specific, potentially less active, branch is cloned,
resulting in a repository with more commits than necessary.
In addition, unless 'got fetch -b <branch>' is used, the remote HEAD branch
will be fetched if branches are not set in got.conf and there is no work
tree to ascertain a branch, or said branches are not found on the server.
ok stsp@
- Commit:
bd56d7e1de5fb58f775afab6d908dbea7a2833de
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
unbreak send.sh regress from recent ref-delta changes
fix argument order typo in flags passed to got_pack_create()
- Commit:
d35c69f0312bf3a3e11a2668c942bacdded34b4d
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got-build-regress.sh: build gotd too; ok stsp@
- Commit:
98350b2093e571c5d8143e22d85c1f515a6c85f4
- From:
- Omar Polo <op@omarpolo.com>
- Date:
unbreak gotd build after recent change to got_pack_create
- Commit:
c2f6116512a017b5c892b5e6cb42c7668d9566a1
- From:
- Omar Polo <op@omarpolo.com>
- Date:
mention GOT_TEST_PACK=ref-delta in the README too
- Commit:
bfeaf20697447c069684b6367fa5eb5e7920ce5b
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got-build-regress.sh: add another round of testing with ref-deltas
ok stsp
- Commit:
c498e6d82b643effe611454e1018521173725ca9
- From:
- Omar Polo <op@omarpolo.com>
- Date:
regress: run gotadmin pack -D if $GOT_TEST_PACK=ref-delta
ok stsp
- Commit:
c7a4fcc8bebad9dc0bd1183fec3bd405dd4ebc57
- From:
- Omar Polo <op@omarpolo.com>
- Date:
gotadmin pack: add a -D flag to force using ref-delta
Intended mostly for the regress suite, so we'll be able to test also the
ref-delta code paths.
ok stsp@
- Commit:
bcfa81c7d30bcafdd71a03b1ca679ad735fd0a80
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got-build-regress.sh: use -eq/-ne instead of ==/!= for numbers
- Commit:
cde544b29d344a5c884ca3948d1826520308a353
- From:
- Omar Polo <op@omarpolo.com>
- Date:
regress: allow to run only a subset of the test cases
This allows to run only the test cases named on the command line.
- Commit:
0e0165f13a58bad062d9761626c1b3ba82df671c
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Mark Jamsek <mark@jamsek.dev>
- Date:
add -n to 'got commit' usage; patch by Josiah Frentsos
- Commit:
ac51614e087279834159667c6f71fffe546cffa6
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
keep regress testname copypasta fix from 2a19e2e21a
s/fetch_branch/fetch_honor_wt_conf_bflag so we don't report the wrong
test in the case of failure. The incorrect testname was introduced in
1cb79834ea as the result of too much copypasta. It was subsequently
fixed in 2a19e2e21a but then backed-out.
- Commit:
4bff57b4b66990d6829cb83645d1f1d478ae0cea
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
backout got: always fetch remote HEAD except when -b is used
As pointed out by naddy, this behaviour is not ideal when users
want to limit their repository to a particular branch which will
diverge from HEAD over time, such as -stable branches.
See https://marc.gameoftrees.org/mail/1676388048.8632_0.html
- Commit:
2a19e2e21a876bbc4ae1999ca08ce4c8f2002158
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
got: always fetch remote HEAD except when -b is used
Rather than only fetch HEAD when there are no branches set in got.conf and
there is no branch to be inferred from a work tree, or said branches don't
exist on the server, always fetch HEAD unless 'got fetch -b branch' is used.
ok stsp@
- Commit:
e8049a88bfce89f411671eb3be9a949001534496
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got.1: tweak commit -A description. ok jamsek
- Commit:
a4515c6608c1b685bfa9187b2517b44773a11068
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
got: drop commit -A $GOT_AUTHOR restriction
As discussed with op and stsp on irc, this prevents the valid case of
changing a commit's author to yourself during a histedit operation, and
potentially blocks other valid use cases too.
ok stsp@ and op@
- Commit:
1fa0d17d767f8e443af3b4493f3f2af0e759dda9
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got/tog/gotadmin: pledge earlier
In the case of tog move setlocale(3) before pledge(2), as suggested by
stsp.
ok stsp@
- Commit:
ff08dcd6c83d27f29c7eb78f7b21fee64bebfdd2
- From:
- Omar Polo <op@omarpolo.com>
- Date:
send_tree_entries: simplify len computing
- Commit:
f72ce919dd6d6c15679c5174c47912ac55be1e18
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Mark Jamsek <mark@jamsek.dev>
- Date:
make 'got fetch -b branch' error reporting more helpful
The patch to got-fetch-pack.c was written by stsp with only minor tweaks
by me. Regress updated to account for the change in reporting.
stsp's original got-fetch-pack.c diff ok op jamsek
ok stsp@
- Commit:
1cb79834eab33d1c1c01731b4800bab440032f20
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
regress: fetch -b/got.conf/wt/remote HEAD interaction
The added test checks we honour the correct precedence of branches to be
fetched, which is determined by: the -b flag; branches set in got.conf;
the work tree's current branch; and the remote repository's HEAD branch.
If a branch is specified with -b, only fetch this branch and if it does
not exist, simply report to the user--do not fallback to other branches.
Otherwise, if branches are either not set in got.conf or are set but do
not exist on the server:
- if invoked in a work tree, fallback to the work tree's current branch
- if not in a work tree or the work tree's current branch does not exist
on the server:
- fallback to remote HEAD.
With this, only the -b case can result in an unsuccessful fetch due to the
requested branch(es) not existing on the server. All other cases will either
fetch updates or report "Already up-to-date" (excepting errors).
ok stsp@
- Commit:
0dd7613ce65424868ec86f0623e38eb70d9a9321
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
special case 'got fetch -b <branch>' to only fetch <branch>
As discussed on irc, this drops the implicit remote HEAD fetch when -b is used.
got.1 has been updated to make the new fetch behaviour clear.
ok stsp@
- Commit:
7b771fb638e62245e029bcceaa32c0dce315b23c
- From:
- Omar Polo <op@omarpolo.com>
- Date:
style