Commits
- Commit:
d952957db624ae4f22a8bf310c4ab918f3a9dbd3
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
optimise parsing of modified files for conflict markers
As per stsp's original design for detecting new conflicts, rather than produce
a diff formatted for human consumption, parse the raw diff result to scan only
newly added lines for conflict markers. While here, fix a couple related bugs
in the original implementation: (1) rewind the versioned file blob so we don't
end up with an empty "from" (i.e., LHS of the diff) file; and (2) force an
ASCII text diff for so we don't miss conflicts in binary files.
ok stsp@
- 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:
2c4740ad12b787db8704cb160abc4f1e5e73d911
- From:
- Mikhail <mp39590@gmail.com>
- Via:
- Mark Jamsek <mark@jamsek.dev>
- Date:
style(9): function call in initialiser patch by Mikhail
- Commit:
b4b2adf52ba9b7ad15eb9423cbc20034cdacbbbf
- From:
- Omar Polo <op@omarpolo.com>
- Date:
add functions to extract object ids from fileindex entries
ok stsp
- Commit:
b0a0c9eda4b7f60ae432f321389f9c344b6c0fc2
- From:
- Omar Polo <op@omarpolo.com>
- Date:
move comment
it describes bump_base_commit_id_everywhere, not its per-entry callback
bump_base_commit_id.
- Commit:
ef85a376d8f41068fa9c6b11bc1fff98e3e9520c
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
zap unused parameter in got_worktree_rebase_complete()
ok stsp@
- Commit:
c48f94a406682029fa132ede24321b2622641970
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
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@
- Commit:
1f3405c91dec0b4eb48df5156751b5ef6add3f37
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
910d235d362fb7951e997ce08e3dfb4b8cb24c5d
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
typo: pass rejectfile--not outfile--to got_ferror()
ok stsp@
- Commit:
d8bacb933720b8819f0c4e76b004775aa1885b9b
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
a76e88e58fb716d5dded83442b153b60687283cb
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
210c2321a3810880ec21d1c0f1ae41b5c0f4acc1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
do not hint at empty temporary diff files in the log message buffer
ok op@
- Commit:
4ba5cca9fcd43c92643d303d9fade96556bfbe00
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
ensure that files are in a state where a diff can be created, before diffing
ok op@
- Commit:
6d15dc69f06b84b429b255763d5f75e9f22869a7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use a global flag instead of a per-file flag to detect staged changes
ok op@
- Commit:
b90054ed55f30ebe28115abf5ad9cecc2b925713
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
2a47b1e5852390eadc730c1dd2dd7caae011adfa
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
provide a diff of changes in a temp file while editing a commit log message
ok landry@
- Commit:
b2b3fce13e4eca588bb28a869b07f0063568b505
- From:
- Omar Polo <op@omarpolo.com>
- 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:
a06ca3f74892062294f3752ab15a9e5d7778a106
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
check for unlink(2) errors with the == -1 idiom, rather than != 0
ok op@
- Commit:
4ba2e95571e317867b5ed45cb6c8580a33627500
- From:
- Stefan Hagen <sh+got@codevoid.de>
- Date:
got: don't search through ignored paths and files on commit
- Commit:
5e91dae4dd43b8024731223110ab18f505f453ac
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove trailing whitespace; patch by Josiah Frentsos
- Commit:
50e7a649ac62e04706162f1e9b7b37e7485fc7ca
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
598eac4331d322ab9e91ee6864c54845e3a6e86c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
reset committer during rebase and histedit
ok op@
- Commit:
f8399b8f3e641c8eb8f0a50bc42f648efeb7eacc
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
call time(3) just once in commit_worktree(), not twice
- Commit:
3c29341b5d4937ebdd1af08c9dc1dbd9169a6200
- From:
- Florian Obser <florian@narrans.de>
- Date:
path_got is unused and never assigned, no need to free it
OK stsp