Commits
- Commit:
0ffe39b0c5a0f782cded7ffb2154b89a1c3c2086
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show how to fetch a pull request in got.1 pull request example section
- Commit:
35d2583f834a66f801dc229002d45e735882ba78
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
allow no-op merge commits to be created
Requested by James Cook
- Commit:
07fa936579660934e2b84e747df1d21810278e11
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle files changing into directories during 'got update'
problem found by naddy@
- Commit:
e02ef4272327ac8f401337fc9e9f79963b2f0472
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
got.1: list all options which can be used to generate a histedit script
- Commit:
6685e2e8b2b4865d3b68e933360528e6382eb28e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
Apply 'histedit -e' wording tweak from James Cook, thanks!
- Commit:
456d8970e17b1f146aeb38a5e330063e190697d3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
in got.1, clarify what users are expected to do during 'histedit -e'
Gap in the documentation pointed out by James Cook.
- Commit:
5a53ca9d31c0ec26e10887fb404d63242df55002
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fall back to vi(1) instead of ed(1) if neither EDITOR nor VISUAL are set
ed users are reading files with their minds rather then their eyes, and
might therefore be missing important visual clues we write into files
before the user gets to edit them. Use of vi(1) ensures that such clues
will not be missed.
- Commit:
249b637c505366856603a932c859a0baf1973d10
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
have ignore patterns with trailing slashes match directories only
ok jamsek
- 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:
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:
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:
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:
93436ccdaf0945f5fdb4b5cd2b90c9ac0bb14c83
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
got: use timestamp and emptiness to validate log message
As suggested by naddy: consider commit log messages valid provided the temp
file time stamp has changed and the file is not empty. This heuristic
provides the desired behaviour (i.e., reusing cherrypicked/backed-out log
messages) that's currently provided but is simpler to grok.
Improved by and ok stsp@
- Commit:
91a3781a11d1b2c483221d9dca87d72aea17637b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make edits made to comments count as a log message modification
This supports use of cherrypick/backout without requiring the user
to modify the log message of the original commit.
ok jamsek, op
- Commit:
49351f3bf4ab5a99f1b0653e176e01ab5988acde
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got import' -I option match directory names with a trailing slash
reported by Lucas on IRC, who sent a patch which this commit was based on
ok jamsek
- Commit:
ccbbf026bf5917a8d66564fcce9184b29412432b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
improve 'got fetch' behaviour when work tree's branch is not on server
Only fetch the work tree's branch if the -b option is not specified.
This keeps -b functional as an override when invoked in a work tree.
Our previous changes did not consider that got.conf is also a source
of lists of branches to fetch, and that -b is supposed to work as an
override of any default behaviour. We were implicitly appending the
work tree's branch as if it was mentioned as an override on the
command line, which was wrong and based on a misunderstanding of
the intended behaviour.
Without -b on the command line we obtain a list of branches to fetch
from got.conf and use this list if it is not empty. The repository's
HEAD will be fetched only if neither the -b option, nor got.conf, nor
a work tree tell us what to fetch.
Make the man page more clear by moving the explanation of the default
behaviour into the main section of 'got fetch', leaving the -a and -b
option descriptions free of such details.
ok jamsek
- Commit:
66d2f9c8151ab2386b1b9369c63d9bbc500243b1
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
fix missed doc update of new 'got fetch' behaviour
ok stsp@
- Commit:
ddb2df58a374b7058f0d3044c25b821680bd3345
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
got: make fetch default to the work tree's current branch
As per stsp's todo item, if invoked in a work tree, make 'got fetch' default
to fetching the work tree's current branch instead of the branch pointed to
by the remote repository's HEAD.
ok stsp@ and op@
- Commit:
f1c9fe20d35f9b64cee89491805039b13c91c8de
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
got: add 'got histedit -d' flag to drop all commits
Like -f, except drop all commits. Discussed with op and stsp on irc.
ok stsp@
- Commit:
8bf76af3f358c0ad73a45348c76647955efc78e8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
got.1: editing merged log messages is no longer optional, tweak related wording
- Commit:
555f1fe02608935b41d521bc76d298526e916229
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Stefan Sperling <stsp@stsp.name>
- Date:
got.1: Mark the commit argument to cherrypick and backout optional
patch by Josiah Frentsos
- Commit:
4c16511c12ddf2bf3af298a4b6cd295ff1ba1bd1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
clarify documentation of cherrypick/backout log message recording
ok jamsek
- Commit:
9587e6cc5169e6d39431fd1066097fd3f04e5d51
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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@