Commits
- Commit:
f259c4c18277237ced1043033cb1af739f73db28
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a 'got merge' command for creating merge commits
Additional testing by Thomas Adam.
ok tracey
- Commit:
9f98ca0596877b609e3785a877d36dca6c774c24
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show parent commit IDs of merge commits in the tog diff view
ok tracey
- Commit:
0e5df9843b907e2f3bb8bae341f4ac0d5762346a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
update TODO note about HTTP; libtls will more likely be used from dial.c
- Commit:
3af9de885a0d557ecb7810536cd451f3c320fa68
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix 'got send' with tree objects which contain symlinks; reported by Omar
- Commit:
ad324bf53a11587dc227a2c00b65020595aa18dc
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix histedit_no_op test which was failing randomly
A no-op replayed history ends up having exactly the same commit IDs
if all commits are created at roughly the same moment in time.
There are no content changes involved so if commit timestamps do not
differ then commit hashes will be the same. In which case there is no
fork in history for 'got histedit -l' to display, yet the test was
always expecting a fork in history to be displayed.
Update the test to take this issue into account. The test will now pass
no matter which result is produced by the histedit operation.
Problem found by Lucas who observed that this test was randomly failing.
Patch also provided by Lucas.
- Commit:
34c3415fac1e6f7bb8fb803417020063834c6112
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
update README blurb about 'ssh 127.0.0.1' requirement for regress tests
- Commit:
3da8ef855d7d7b3da96a9f1cba55df276e112f11
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
tog: use sched_yield(2) instead of pthread_yield(3) for portability
pthread_yield(3) is an optional POSIX 2001 extension while sched_yield(2)
is part of POSIX 2008. On OpenBSD they are actually equivalent, albeit not
documented as such. Using sched_yield(2) helps the -portable version.
Patch by Quentin Rameau
- Commit:
6062e8ea890c053733ec0ad3387a40da18a45cda
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
tog: document why _XOPEN_SOURCE_EXTENDED is set and don't undefine it
- Commit:
ac372b601e0be8eb794f071912ddb1efc81ea8a8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
'got status' does not have a -q option; remove it from got.1 synopsis
- Commit:
df7dea6e70ae149a51b80d537544c007bdb03258
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add -S option to 'got status' synopsis in got.1 man page
- Commit:
7dd7d39b1e5196830234690ea1db776cf036a4bf
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
bump version number
- Commit:
4a87b3701d0c943155b64f698e7d9db32ba57fbb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
CHANGES for 0.60
- Commit:
67d7451ca0b909687a2689243077b8d7edb65102
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
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
- Commit:
f0fd0aafb69cafd7c84dd294cffda4b3c1d6144a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got send' regression tests run 'git fsck' on all involved repositories
- Commit:
c2105d002a73e60c6f3194dd96a1a0b09eb34e08
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix another instance of 'got send' sending branches the server already has
- Commit:
13364f2d81ad613f67036d34a5181ff1cb1ecf3c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
bump version number
- Commit:
47975383a20a6f2928b43b33b8a7805c7cc1fc8d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
CHANGES for 0.59
- Commit:
e3a46353dce2f604254675a385e8871bee794d32
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
verify that 'got status -s' and 'got status -S' cannot be used together
- Commit:
4f3c844beaeb6a0b30565833e0481b8de9a5106e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got update' display the worktree's branch name upon success
ok tracey
- Commit:
67c65ed764e7542fc784be76cd535c4073c813c3
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
add tests for checkout -q, update -q, and status -S. ok stsp
- Commit:
788d4a19ed0ddf9df069f9a6d5a8ecd9ebf932ee
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
validate status codes given to 'got status -S'
- Commit:
b043307bfaa7ea801d19677c0cdb5d4074c0c234
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make got status -s and -S options conflict
- Commit:
08e5873e99dff11184476ccc3186fbd2a97a2e0b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got checkout' display the checked out reference and commit ID
ok tracey
- Commit:
00357e4dc78f7f5bd12eceaa07592ab743996e12
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
add suppress status-code selection to got status. this allows for a quick way to
clean output without the use of ignore files. ok stsp
- Commit:
26960ff7b4461002e1b3b1c5c0ffd0e492bc71ba
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got send' properly send commits which are referenced only by tags
Problem reported by Omar Polo.