Commits

Commit:
92a9e85d28a30997176ce0d3c2915e3ea70782c7
From:
Thomas Adam <thomas@xteddy.org>
Date:
portable: add FreeBSD support This adds the capability to compile got-portable on FreeBSD.
diff | patch | tree
Commit:
e6f4ba3109814ba43d3a9e9c9c9dc55c40149dbc
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
fix 'got update' of an added + obstructed file When 'got update' tried to add a new file to the work tree and this file was obstructed by, say, a directory on disk, the update failed: $ got update ? new got: new: Is a directory $ And the work tree was not updated. With this commit this situation is properly detected as an obstruction and the update succeeds: $ got update ~ new Updated to refs/heads/master: c1f85b4938dc4c668a88f13df2b98a520fc077cc File paths obstructed by a non-regular file: 1 $ Extend a corresponding test case to cover this issue. ok tracey
diff | patch | tree
Commit:
dfe86d1fa6f81d3a709059eda591863efd8d5a34
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
plug memory leak in got_worktree_merge_in_progress(); spotted by tracey
diff | patch | tree
Commit:
10604dce6e625d11974fb5491598bbb54069e5d3
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
add a 'got merge' command for creating merge commits Additional testing by Thomas Adam. ok tracey
diff | patch | tree
Commit:
dd038bc6ec835ad3fd3c0b5303b8af9ad506c8cc
From:
Thomas Adam <thomas@xteddy.org>
Via:
Thomas Adam <thomas.adam@smoothwall.net>
Date:
portable: initial Linux compilation This commit modifies the GoT main branch to be able to compile it under linux.
diff | patch | tree
Commit:
abc59930d57a2d46c310e1b0c758c948554bc1af
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
indentation fixes
diff | patch | tree
Commit:
69de9dd4215502c97f3e9b6c95cd1ce609fba278
From:
Stefan Sperling <stsp@stsp.name>
Date:
limit checks for merge conflicts to files affected by the merge Performance problems reported by naddy
diff | patch | tree
Commit:
5546d4669ccce281a6f6f89ccf204e671ed0d3a9
From:
Stefan Sperling <stsp@stsp.name>
Date:
plug a memory leak in check_merge_ok()
diff | patch | tree
Commit:
243a13f59c19fd9761211d200b68b77f99f6aded
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix bogus error when 'got cherrypick' merges changes into a locally added file reported by + ok naddy
diff | patch | tree
Commit:
6c13b00592a6253b4a4de885b1f595e141b65281
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
dae2a678dfc5685c0f121fd205f62439f417dcc5
From:
Stefan Sperling <stsp@stsp.name>
Date:
backout 7280143edc2d689b1f57d5a46d376e48cdae64a2; not needed after all
diff | patch | tree
Commit:
0e33f8e0becf732ab33b3ce78c026790a651a5f9
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
7280143edc2d689b1f57d5a46d376e48cdae64a2
From:
Stefan Sperling <stsp@stsp.name>
Date:
refactor collect_commitables() to make it easier to call from elsewhere later
diff | patch | tree
Commit:
ff56836b1637f806bb308057ef9bd6d90b725568
From:
Stefan Sperling <stsp@stsp.name>
Date:
Make 'got add' always require the -I option in order to add ignored files.
diff | patch | tree
Commit:
2c41dce749de6cee00ec5b611d0509f9e45f0fd7
From:
Stefan Sperling <stsp@stsp.name>
Date:
allow obstructed files skipped by 'got update' to be updated again
diff | patch | tree
Commit:
a769b60bb76783d3bc6637d75907b6ca5d623f40
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix a bug where files skipped by 'got update' could not be updated again ok semarie@
diff | patch | tree
Commit:
dbdddfee1482b50ca8c4a0be06e4fec6a59fb9f4
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
switch from SIMPLEQ to equivalent STAILQ macros The singly-linked tail queue macros were added to OpenBSD 6.9 and are more widely available on other systems. ok stsp
diff | patch | tree
Commit:
f6343036aa4d7e3805a44832b566b531271c1c6d
From:
Stefan Sperling <stsp@stsp.name>
Date:
new -I option for 'got status' to show files which match an ignore pattern
diff | patch | tree
Commit:
1c4cdd89292391629861b9a13688e94879efe2ea
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix bogus 'permission denied' error when a file at work tree root is removed ok naddy
diff | patch | tree
Commit:
fdf3c2d3876d076bf098461a4d147227126588b4
From:
Stefan Sperling <stsp@stsp.name>
Date:
use Patience diff for merging during cherrypick/backout/histedit/rebase This has been shown to prevent mis-merges in some cases. It's probably not a final solution. We should look at what Git's "recursive merge" is doing and implement something similar. Keep using Myers during update/unstage. The advantage of Myers is that it produces smaller conflict chunks, and there are no known cases of mis-merges which affect update/unstage.
diff | patch | tree
Commit:
1d0f405485b02cc4480ea188879e4122e0ea32bd
From:
Stefan Sperling <stsp@stsp.name>
Date:
check for close(2) error in got_repo_close() and propagate errors up ok tracey
diff | patch | tree
Commit:
54d5be07768d1e312078b5eb60f0e32738a1631a
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix unrelated changes being merged by got cherrypick/backout/rebase/histedit This was a long-standing and very annoying bug. The two xfail tests in the cherrypick test suite are passing now.
diff | patch | tree
Commit:
1af628f4bfa50c224b392a774e72a213c97f6009
From:
Stefan Sperling <stsp@stsp.name>
Date:
switch merge_file_cb() to using merge_file() instead of merge_blob()
diff | patch | tree
Commit:
eec2f5a957bde0458cfa8ee022528e4aeabb708e
From:
Stefan Sperling <stsp@stsp.name>
Date:
decouple merge_file() parameters for 2nd derived version and merge target file
diff | patch | tree
Commit:
dc082d4a7ad5857602ab64aaea1f836ce47b689b
From:
Stefan Sperling <stsp@stsp.name>
Date:
in merge_file(), remove allocation of a base_path which is unused
diff | patch | tree