Commits
- Commit:
3b9e6fcfb6688f928cfe62fee08d34d6c8d85992- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
simplify deflate checksumming code; fixes errors with upcoming 'gotadmin pack'
tweak + ok naddy
- 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.
- Commit:
1af628f4bfa50c224b392a774e72a213c97f6009- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
switch merge_file_cb() to using merge_file() instead of merge_blob()
- Commit:
eec2f5a957bde0458cfa8ee022528e4aeabb708e- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
decouple merge_file() parameters for 2nd derived version and merge target file
- Commit:
dc082d4a7ad5857602ab64aaea1f836ce47b689b- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
in merge_file(), remove allocation of a base_path which is unused
- Commit:
07bb0f933a402d7387f7dd360060c55cdd1b56c0- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move merge_file()'s f_deriv parameter next to the f_orig parameter
- Commit:
db59069162efd1ccd4f236abe7d8eb3ca4b791e4- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make merge_file() accept FILEs instead of paths for orig and deriv inputs
- Commit:
67a666476ff7ffc6e95f7d9b994a8f7b01cb86e5- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
refactor merge_file() such that it no longer requires a blob object parameter
- Commit:
3cd22b214454d9973c61426c8a4bd7cf2f8de6ae- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add an xfail test for a cherrypick bug where unrelated changes get merged
The test case I am using here is a bit large but I could not yet find a way
to make it smaller. If someone knows a smaller test case, please let me know.
naddy caught a small bug in the new test code I had written, thanks!
- Commit:
f270548637fc35b5b9576bd91ac1bdcbffb1f039- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
dial_git(): fix memory leak and simplify
Simplify dial_git() by formatting the initial Git protocol packet
with dprintf, suggested by millert, and stop leaking an asprintf
buffer.
ok stsp
- Commit:
57c181985845591d1fcd97be660feb8e256fd4be- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
validate reference names in open_ref()
This catches invalid reference names passed to 'got ref -l' and will also be
needed to validate reference names passed to a future 'gotadmin pack' command.
ok naddy@
- Commit:
91b40e30e0dbff0c8a1546a02fb784fa8007a91b- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add checksum support to got_deflate_to_file()
This will eventually be used by 'gotadmin pack'.
Checksum init and finalization will need to be done by the caller
since many objects will be written out in compressed form while
we are computing checksums across the entire pack file.
ok millert, naddy
- Commit:
af8a5c4afbbf686b427349764d9a2315d49f99ad- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
plug a memory leak in got_ref_list_free()
Code which inserts a reference into a reflist passes ownership of
this reference to the list. However, got_ref_list_free() never
closed such references, which resulted in a memory leak.
ok tracey
- Commit:
9069347b693ed2803ca224d77823b2e4e2f2e4e5- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
improve error reporting when delta application fails
- Commit:
e5ad73651d7663bfc6ca5d6f3ec622c5f59413bf- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix file descriptor leak when got-read-object returns a raw object
- Commit:
dbbf4a5f0cfb712c5970dcb79a65c5dd2e62b19a- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
allow got_deltify_free(NULL); will be needed by 'gotadmin pack'
- Commit:
932dbee786f1c1497e07a16ada6e3dbb755fdd08- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix wrong function name in error message; pointed out by Mikolaj Kucharski
- Commit:
a486b62b84f47c216ce7fd12eaacf6cc2acfaf74- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
ignore SIGWINCH while polling in the main process
Avoids an error where tog(1) would exit with "poll: Interrupted system call"
while the terminal window was being resized.
ok millert
- Commit:
a3af57b852fbc7353bf13955b95da3b4eff19d62- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove unused worktree-related includes from lib/repository.c
- Commit:
6648f956151e70fa5b1229d78c0aa7dfaa23be96- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
properly render an error page instead off returning 500. bug reported by Miniontoby via irc
- Commit:
91c822287f301e456932520144ecfeccc5603383- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
got.1: make double-quotes appear in the rendered man page as intended
Patch by Nam Nguyen
- Commit:
cce854ad474288cfa4b40b90c875a6b1bb2b67e4- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add tests for the bug fixed in commit 1fee9f40e2ed335d4ec8899954b59b43990b97c3
one of these tests is still failing; there is another edge case left to fix
- Commit:
1fee9f40e2ed335d4ec8899954b59b43990b97c3- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix 3-way merge of files which lack a final \n
problem found by jrick
ok millert
- Commit:
6c19a3dcfa5f03ec889d629dded9ff4dfa9f6237- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add missing comma in SEE ALSO section of git-repository(5)
- Commit:
0a79feb19b449594a4dbf7aad0a5a5e0c4cd6c9c- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
Xr gotadmin(1)