Commits
- Commit:
f4ab0e5770b96257cb1a43cfe292daa54f2b402e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got status' display interrupted rebase, histedit, and merge operations
When an operation is interrupted add a trailing message to status output
which displays the operation and branches involved.
This information will be useful when diagnosing problem reports and it
helps new users with contextualizing multi-operation work tree state.
ok op@
- Commit:
a854b8c994a1381e4c6f2ba45bef9c22da0ec956
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
initialize and tidy up *branch_ref in got_worktree_histedit_continue()
- Commit:
8c8d22ba3f20c7468ada36f3f21837de6483fa8c
- From:
- Omar Polo <op@omarpolo.com>
- Date:
fix use of uninitialized variable in update_blob
spotted by smatch. ok millert@
- Commit:
06bd8ee415aa89adaeb49825ad96dfe83554b77e
- From:
- Omar Polo <op@omarpolo.com>
- Date:
fmt
- Commit:
8fd0d1965f6393cf1ae1776daee76543055e0dd8
- From:
- Kyle Ackerman <kackerman0102@gmail.com>
- Via:
- Mark Jamsek <mark@jamsek.dev>
- Date:
plug memleak of the ignore list in 'got status'
Found/reported and patch by Kyle Ackerman.
ok op@
- Commit:
9e83097f9b3fc262356cc5189409a0e472d1084b
- From:
- Kyle Ackerman <kackerman0102@gmail.com>
- Via:
- Mark Jamsek <mark@jamsek.dev>
- Date:
plug pathlist leak in 'got status' code path
Patch by Kyle Ackerman.
- Commit:
ef6234452a17eb17687612d9bd417ded3bf6802d
- From:
- Omar Polo <op@omarpolo.com>
- Date:
actually detect modified files when checking out with -E
When checking out over a pre-existing directory tree with -E, got
would store the checkout timestamp in the fileindex and so not
detect local edits until those files are touch(1)ed again. Instead,
detect that a file already exists during checkout and don't update
its {c,m}time, leaving them to zero (the epoch), so a subsequent
`got status' will look at its contents.
While here, change the status char for such file from ? to E, which
is what the manpage actually documents.
Issue reported by naddy@
ok stsp@
- Commit:
f6635657d4d78b75242d294ae26086c05bfa489d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix deletion of missing locally-added files
If a locally added file in A status gets deleted from disk it will
move into missing ! status. If the user then decides to delete the
file we must remove the file index entry immediately rather than
flagging the file for removal during the next commit operation.
The file was never committed and lacks a base-blob and base-commit,
so it cannot be removed during the next commit. As a result the
commit operation was reporting a bogus "out of date" error.
Found while diagnosing a related bug reported by gonzalo@
ok op@
- Commit:
c78dbc033c5063cc79ab16426bdae976aa5beb87
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
prevent a double-free in got_worktree_commit
If creating the /tmp display diff for a commitable item failed we
would free the commitable item while it was already on the path list.
Later on when the path list was freed in got_worktree_commit() a
double-free would be detected and the program would be aborted.
Found by gonzalo@
ok op@
- Commit:
c2ba7aa6808a2583895c024f5c85fff03948494e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
allow modified files to be deleted during merges if content exists in the repo
This makes histedit folding work when a file is modified by commit A
and then deleted in commit B, with A being folded into B.
Problem reported by naddy@
- Commit:
e07c178232d764c5a0518412c4a9348e6d24cfc1
- From:
- Omar Polo <op@omarpolo.com>
- Date:
pass the right callback argument for check_mixed_commits
- Commit:
f6b8c3c2253c61e60153121cfa4da7c350787598
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix some non-idiomatic calls of the cancellation callback
This callback could return any error code. Do not mask all such
errors as cancellation.
- Commit:
cdbfe5d2325bd7ae7a197ce5e7a93fcdba9097cb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add cancellation support to the mixed-commits checker in worktree.c
- Commit:
99301cec42290cd26b9757c17eaaab5d70781bf1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
load tog's worktree base commit marker in the log thread for startup speed
Walking the whole file index can take some time. Avoid delaying the perceived
start-up time of tog by reading the file index in the background log thread.
Problem pointed out by op@
with fixes from + ok jamsek
- Commit:
c935fd512b9937ffefdd248a3a840d0530011a1e
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
tog: show work tree base commit marker in log view
If tog is invoked in a work tree, prefix the base commit log message summary
line with a '*' if the work tree is up-to-date, and with a '~' if the base
commit is not up-to-date with respect to the branch tip or it contains mixed
commits. While here, plug a couple worktree leaks in cmd_ref() and cmd_tree().
ok stsp@