Commits

Commit:
49213cad8cad44e38cd6a8da2595657b3dc11077
From:
Stefan Sperling <stsp@stsp.name>
Date:
changes for 0.57
diff | patch | tree
Commit:
eca70f98448556db333b7c61d37122488b572422
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix 'got send' adding too many objects to the pack file in some cases Load server-side tags before loading local commits. Otherwise objects which are reachable via server-side tags will not be filtered out.
diff | patch | tree
Commit:
0baddd91502bcd7aca9f72f5ded3609326c953cf
From:
Stefan Sperling <stsp@stsp.name>
Date:
add test which covers a cherrypick merge from a branch to itself
diff | patch | tree
Commit:
ed99f061b0cece8bf32baf31bd5e6b9e39509127
From:
Stefan Sperling <stsp@stsp.name>
Date:
add a test case which covers 'got cherrypick' in a mixed-commit work tree
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:
6435d2a6d2c84c4875a0c6f641b06d7cd1796a0c
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
sys/param.h is not needed
diff | patch | tree
Commit:
5546d4669ccce281a6f6f89ccf204e671ed0d3a9
From:
Stefan Sperling <stsp@stsp.name>
Date:
plug a memory leak in check_merge_ok()
diff | patch | tree
Commit:
a16d97bdc65b49050d622450d50642fa98eb3cc1
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove ancestry sanity checks from 'got cherrypick' and 'got backout' While these checks might catch usage mistakes the performance overhead of scanning the entire history of the current branch is not worth it. Measurements provided by naddy, cherrypicking 5 commits of OpenBSD's src repository in usr.bin/rsync: Before: 5m50.33s real 4m02.36s user 2m04.41s system After: 1m04.92s real 0m28.24s user 0m36.54s system Further performance improvements could be needed but this is a first step.
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:
4deef56fe9fdbfef7d2ecd12947ff515a0daae78
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
tog: add support for navigating to first/last line of blame view ok tracey stsp
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:
4c662b1dc9113e3f0bbf38b33e085977f6452e27
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix test data directory name used by test_histedit_fold_add_delete
diff | patch | tree
Commit:
e1d27370ef5a6da06bbda0fc78bf629f1cb3ccd3
From:
Stefan Sperling <stsp@stsp.name>
Date:
Fix ksh completion example to complete the first arg only; from Clint Pachl
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:
eac1df479eff0a068548f94b188529f0249fd9be
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got send' heed the branch {} options in got.conf(5); they were ignored ok naddy
diff | patch | tree
Commit:
3a6b87604592c583079227ea995f50eb3ec74121
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
use the POSIX-compliant "date -u" command to return UTC time; ok stsp
diff | patch | tree
Commit:
dc8256b60dd076b61c44c4cf547127149bb6b15c
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
"got blame" now shows UTC dates, adapt regression test; ok stsp
diff | patch | tree
Commit:
c2d7bc3f2831dfbe9406b0858dbae9384247467d
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove superfluous strdup(3) from parse.y files; Patch by Martin Vahlensieck
diff | patch | tree
Commit:
2cf9e3ff298ed9a841b21d51174003f268b33a01
From:
Stefan Sperling <stsp@stsp.name>
Date:
bump version number
diff | patch | tree
Commit:
ce0c9cde93dae0666f3d1bbc26264188f2cf3399
From:
Stefan Sperling <stsp@stsp.name>
Date:
CHANGES for 0.56
diff | patch | tree
Commit:
0d64986a88afec539afd40069c1d41c3f6ec1517
From:
Stefan Sperling <stsp@stsp.name>
Date:
sync dist file list
diff | patch | tree
Commit:
1dd93b2a37823ef322c22aa1a8ff94c53fb25186
From:
Stefan Sperling <stsp@stsp.name>
Date:
use more precise wording to describe why End/G commit loading can be slow
diff | patch | tree
Commit:
9ebbe6e1ffb90c55372b92fb35274daf91b30374
From:
Stefan Sperling <stsp@stsp.name>
Date:
Mention Backspace key in the section which introduces the End/G keys, too.
diff | patch | tree