Commit Briefs

54c3959693 Stefan Sperling

use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA

diff | patch | tree

a615e0e779 Stefan Sperling

implicitly mark all files in work tree as up-to-date after rebase/histedit

This should always be correct, since rebase and histedit start out with a clean and single-base-commit worktree, and end up committing all changes across the entire work tree when they are successful. tested by jrick and myself

diff | patch | tree

f6cae3ed1e Christian Weisgerber

switch function declarations from Korn shell to Bourne/POSIX shell syntax

ok stsp

diff | patch | tree

7fb414ae4d Stefan Sperling

add a -q option to tests for quiet output and use it for 'make regress'

Previous default output remains when test cases are run individually. ok tracey

diff | patch | tree

70551d57b9 Stefan Sperling

add a test for rebase file index corruption problem fix in previous commit

ok tracey

diff | patch | tree

9627c110be Stefan Sperling

show a summary of conflicts and related problems after updating/merging files

ok millert@

diff | patch | tree

a740a1b3a7 Stefan Sperling

use 'got commit' in test_rebase_delete_missing_file instead of Git

diff | patch | tree

ca6da77d8a Stefan Sperling

add a test for 'got rebase' to check behaviour on delete vs. delete

diff | patch | tree

e31abbf21f Stefan Sperling

add -c option to 'got ref' which now expects just one argument after options

diff | patch | tree

a0ea4fc07b Stefan Sperling

show merged commit ID + logmsg upon merge conflict during rebase and histedit

This makes it more apparent which commit contained the conflicting change. The new output looks like this: C sys/dev/pci/if_iwm.c 8a98d848a1a5 -> merge conflict: properly modify station queues got: conflicts must be resolved before rebasing can continue

diff | patch | tree

da76fce2df Stefan Sperling

let 'got branch' switch and update the work tree

ok tracey

diff | patch | tree

1ae0a34120 Stefan Sperling

add a test which ensures that 'got rebase' trims empty dirs from disk

diff | patch | tree

5aa813935b Stefan Sperling

add copyright year for files already touched in 2020

diff | patch | tree

e51d7b55a3 Stefan Sperling

prevent rebase with an out-of-date work tree

diff | patch | tree

38b0338bf9 Stefan Sperling

if there are no commits to rebase, just forward the rebased branch's reference

Problem found by kn@

diff | patch | tree

f69721c3fc Stefan Sperling

show base commit hash and omit filenames in conflict markers

diff | patch | tree

d136cfcb98 Stefan Sperling

show original file content in conflict markers

diff | patch | tree

fc66b545cb Stefan Sperling

fix behaviour of 'got rebase' with no commits to rebase; with semarie@

diff | patch | tree

f032f1f7ee Stefan Sperling

fix and test interaction of rebase/histedit -c and 'got stage'

diff | patch | tree

11495e0417 Stefan Sperling

tweak 'got rebase' conflict error message

diff | patch | tree

4ba9c4f6a0 Stefan Sperling

fix wrong sandbox name used by a rebase test

diff | patch | tree

787c8eb6b2 Stefan Sperling

fix extra whitespace in rebased log messages

Trim leading and trailing whitespace from log messages when creating commits. Fixes a rebase issue but should be a good idea in general.

diff | patch | tree

64c6d99023 Stefan Sperling

prevent rebase in a work tree with an incompatible path prefix

diff | patch | tree

7d5807f451 Stefan Sperling

disallow 'got update' and 'got commit' while rebase is in progress

diff | patch | tree

dcf44d0428 Stefan Sperling

revert accidental change; run all rebase tests again

diff | patch | tree