Commits
- Commit:
a347e6bb7cfe1f6a9df6234f6949003191418466
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
test behaviour of histedit -f with an empty log message
- Commit:
239f5c5ae4c041d2ea8dddae394ce357b016b7a1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a basic test case for histedit -f
- Commit:
71392a05f2ee999ddda39f6b5eb64d0bc292c0ce
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
prevent log message loss of folded commits during histedit
If the histedit log message editor exits without saving its buffer,
Got threw away log messages of all commits which were folded. Only the
last commit message is preserved, which could be something meaningless
like "fixup".
Instead, preserve the initial editor buffer content as-is.
That is not going to be an ideal log message, but doesn't throw away
information and stands out visually because the newly created log message
will start with a comment like '# log message of folded commit a0ff...'
Problem reported by jrick
- Commit:
b380533788adf056655d5bdf9d7e497e53c5d85f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
histedit -f conflicts with -F option
Also fixed as part of a different patch from jrick
ok jrick
- Commit:
ff69268e3d2a6d3adf3c7b6a1284fca5ac8fc62a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use a helper function to generate error messages for mutually exclusive options
Inspired by a different patch from jrick
ok jrick
- Commit:
9f6bb280654be7061fc00305743f6ace71f9a1cb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove redundant explanation of histedit -f and -m options from got.1
- Commit:
b54435ba03758ce44a7b635de5b0eb44a9aa994f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix typo in got.1: "only if" -> "if only"; pointed out by tracey
- Commit:
2a78779e85e34d352d7735c35ba7043a935a59e1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
document that histedit -f can only be used if starting a histedit operation
- Commit:
7f64f4d6a730d414a4060625b2aceb39b89621eb
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
accommodate newer ncurses where panel_userptr() returns a const pointer
ok stsp
- Commit:
826082fed43c92130e9545e829c660b3c2fd2fab
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use getline(3) instead of fparseln(3) in tog, for better portability
ok millert
- Commit:
466785b9264da1a24c92aed9d706e76cc826601d
- From:
- Josh Rickmar <jrick@companyzero.com>
- Date:
add histedit -f flag for folding shortcut
"please push it" stsp
- Commit:
3f670bfb38a502b7309f7db354b9d4f767ea12fc
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix display of lines that end in "\r\n" in tog(1)
Problem found and reported by jrick
ok naddy
- Commit:
437adc9d5be73b4b89441362ec89de754374a5a6
- From:
- Yang Zhong <yzhong@freebsdfoundation.org>
- Date:
add fd field to got_worktree, modify got_fileindex_entry_update to use fds
These changes are intended to make got more compatible
with FreeBSD's Capsicum.
ok stsp
- Commit:
f3b2b5525998f769dba67674168f3ffb3cc495e5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
sync files from diff.git b3fd1fa284e6207b923bd3c887364d9eb93fb340
- Commit:
c5fdccbf542b4d88db2f794fe6e81a7fc35c0b59
- From:
- Yang Zhong <yzhong@freebsdfoundation.org>
- Date:
fix expected output of test_tree_submodule_of_same_repo for packed repos
- Commit:
9cd7cbd12706001e5786d399b4421e5150c82be1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
deep-copy reference names in the log and tree views to prevent use-after-free
ok naddy
- Commit:
bf30f15468e36d39f58e79bc407c20e02d30deaa
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
miscellaneous minor style issues
- Commit:
ca51c5411b14602dbc1b2de3e719eb15b0e7024e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
reload references when the log view is restarted with Ctrl-L
- Commit:
01ca22b169b8d5c62163b746db9d8c6d30fd9f81
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
in tog.1, consistently mark up command names of views with .Cm
- Commit:
21920d7e31d70acb006c03266c93b89af53d2dc1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
in tog.1, sync the synopsis of 'tog diff' to include all supported options
- Commit:
4e0d287073e17725b38ac3103043c87112cd84e5
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
pass the thread_args struct to queue_commits() and trim the parameter list
ok stsp
- Commit:
1e1ff4ed1450f7db40a4abd77d9016432a1291ef
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move the tree view's selection cursor up if the terminal shrinks too much
ok naddy
- Commit:
8b5b8d0ca2f5e814f7cf2921c3dbe91e53012a4e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move the ref view's selection cursor up if the terminal shrinks too much
bug found by naddy
ok naddy
- Commit:
cdfcfb036ce6caac01cb04ae2805cf202a1fc068
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
send resize events to tog child views as well as parent views
problem found by naddy
ok naddy
- Commit:
213556435a701b3010c66843b5b824af2d3b6f72
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix crashes when the 'tog log' view reloads displayed data
This reimplements log view reloading (Ctrl-L), logging of a parent
path (Backspace), and the toggle to show commits on branches (B).
The idea is to reuse the existing log view and change its state, instead
of allocating a new view with a new state and replacing the existing view.
Fixes a segfault that occurs when a parent path is logged with Backspace:
tog tree -r got.git -c 0.44
pick tog/tog.c
'l'
Backspace
-> tog will segfault
The first change in this patch is a partial fix. The log thread should always
check the 'quit' flag as soon as it wakes from sleep. Otherwise it could try
to load more commits after waking up and before checking the 'quit' flag.
It will then attempt to load commits with a NULL commit graph pointer.
This partial fix by itself is not sufficient to fix the crash, since we'll
now see a bus error in the main thread, instead of a NULL deref in the
log thread. The remainder of the patch fixes this bus error.
ok naddy