Commit Briefs

Thomas Adam

regress: fix test failures using ln(1)

GNU ln uses -T instead of -h for no-target-directory. OK thomas.adam

diff | patch | tree

Christian Weisgerber

shell code fixes

Escape sequences are not handled by every echo(1), e.g. not on FreeBSD. '?' is a glob character and must be quoted. '!' is not a shell meta character. ok tracey stsp

diff | patch | tree

Stefan Sperling

verify that 'got status -s' and 'got status -S' cannot be used together

diff | patch | tree

Stefan Sperling

make 'got update' display the worktree's branch name upon success

ok tracey

diff | patch | tree

Tracey Emery

add tests for checkout -q, update -q, and status -S. ok stsp

diff | patch | tree

Stefan Sperling

new -I option for 'got status' to show files which match an ignore pattern

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

fix a bug where 'got status' showed an unchanged empty file as changed

diff | patch | tree

Christian Weisgerber

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

ok stsp

diff | patch | tree

Stefan Sperling

add -s option to 'got status' which acts as a status code filter

Advantages over using grep are that the list of codes is validated against a list of known status codes, and that it is easier to match staged files which can display status codes in one or both of two columns. Prompted by feedback from krw@

diff | patch | tree

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

Stefan Sperling

extend test_status_symlink to cover removal and modification of symlinks

diff | patch | tree

Stefan Sperling

make 'got add' work on symlinks and let 'got status' display them

diff | patch | tree

Stefan Sperling

fix ignores when a path is passed to 'got status'

Problem reported by semarie, who also provided initial regression test code. ok semarie

diff | patch | tree

Stefan Sperling

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

ok millert@

diff | patch | tree

Stefan Sperling

make 'got status' read .gitignore files; support **/ and /**/ in patterns

diff | patch | tree

Stefan Sperling

make 'got status' ignore inaccessible directories (reported by semarie)

diff | patch | tree

Stefan Sperling

make 'got status' find top-level .cvsignore when invoked from a subdir

diff | patch | tree

Stefan Sperling

add support for .cvsignore files, as found in /usr/ports, to 'got status'

diff | patch | tree

Stefan Sperling

add support for multiple path arguments to 'got status'

diff | patch | tree

Stefan Sperling

fix 'got status' recursion problems

diff | patch | tree

Stefan Sperling

make test_status_obstructed show failure output

diff | patch | tree

Stefan Sperling

use cmp -s, instead of cmp, in all command line tests

diff | patch | tree

Stefan Sperling

make 'got status' detect and indicate merge conflict markers

diff | patch | tree

Stefan Sperling

add a basic implementation of 'got rm'

diff | patch | tree