Commit Briefs

69de9dd421 Stefan Sperling

limit checks for merge conflicts to files affected by the merge

Performance problems reported by naddy

diff | patch | tree

6435d2a6d2 Christian Weisgerber

sys/param.h is not needed

diff | patch | tree

5546d4669c Stefan Sperling

plug a memory leak in check_merge_ok()

diff | patch | tree

a16d97bdc6 Stefan Sperling

remove ancestry sanity checks from 'got cherrypick' and 'got backout'

While these checks might catch usage mistakes the performance overhead of scanning the entire history of the current branch is not worth it. Measurements provided by naddy, cherrypicking 5 commits of OpenBSD's src repository in usr.bin/rsync: Before: 5m50.33s real 4m02.36s user 2m04.41s system After: 1m04.92s real 0m28.24s user 0m36.54s system Further performance improvements could be needed but this is a first step.

diff | patch | tree

243a13f59c Stefan Sperling

fix bogus error when 'got cherrypick' merges changes into a locally added file

reported by + ok naddy

diff | patch | tree

4deef56fe9 Christian Weisgerber

tog: add support for navigating to first/last line of blame view

ok tracey stsp

diff | patch | tree

6c13b00592 Stefan Sperling

Update comment regarding the merged_paths list used by rebase and histedit

with insight I obtained while trying to make this idea work, and failing...

diff | patch | tree

dae2a678df Stefan Sperling

backout 7280143edc2d689b1f57d5a46d376e48cdae64a2; not needed after all

diff | patch | tree

0e33f8e0be Stefan Sperling

disable ignore lists during status walks used by rebase and histedit

Fixes rebase of gotwebd branch which added a new directory which is also matched by .gitignore rules on the branch.

diff | patch | tree

4c662b1dc9 Stefan Sperling

fix test data directory name used by test_histedit_fold_add_delete

diff | patch | tree

e1d27370ef Stefan Sperling

Fix ksh completion example to complete the first arg only; from Clint Pachl

diff | patch | tree

7280143edc Stefan Sperling

refactor collect_commitables() to make it easier to call from elsewhere later

diff | patch | tree

eac1df479e Stefan Sperling

make 'got send' heed the branch {} options in got.conf(5); they were ignored

ok naddy

diff | patch | tree

3a6b876045 Christian Weisgerber

use the POSIX-compliant "date -u" command to return UTC time; ok stsp

diff | patch | tree

dc8256b60d Christian Weisgerber

"got blame" now shows UTC dates, adapt regression test; ok stsp

diff | patch | tree

c2d7bc3f28 Stefan Sperling

remove superfluous strdup(3) from parse.y files; Patch by Martin Vahlensieck

diff | patch | tree

2cf9e3ff29 Stefan Sperling

bump version number

diff | patch | tree

ce0c9cde93 Stefan Sperling

CHANGES for 0.56 (tags/0.56)

diff | patch | tree

0d64986a88 Stefan Sperling

sync dist file list

diff | patch | tree

1dd93b2a37 Stefan Sperling

use more precise wording to describe why End/G commit loading can be slow

diff | patch | tree

9ebbe6e1ff Stefan Sperling

Mention Backspace key in the section which introduces the End/G keys, too.

diff | patch | tree

528dedf3fe Stefan Sperling

make tog block other keys except Backspace after End/G is pressed

This should avoid unexpected behaviour resulting from unrelated key presses messing with the log view's state variables. Pointed out by tracey, and also discussed with jasper. ok tracey

diff | patch | tree

26f0cb2407 Jasper Lievisse Adriaanse

sync tog.1 after fb280deb with respect to the Backspace key description

ok stsp

diff | patch | tree

00f6361c1e Christian Weisgerber

remove the 'ctrl+u' shortcut in favor of just 'g' in the diff view, too

diff | patch | tree

751490770b Stefan Sperling

make tog ignore Ctrl+L and B while loading all commits

Otherwise tog gets into a funky non-recoverable state if these keys are pressed instead of Backspace while commits are loading. bug found by + ok tracey

diff | patch | tree