Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.22.2 2019-05-13T14:50:32Z 2019-05-13T14:50:32Z Junio C Hamano gitster@pobox.com 2019-05-13T14:50:32Z urn:sha1:4aeeef377347934d6f459e27f7d793de4ce384bb Mechanically and systematically drop "extern" from function declarlation. * dl/no-extern-in-func-decl: *.[ch]: manually align parameter lists *.[ch]: remove extern from function declarations using sed *.[ch]: remove extern from function declarations using spatch 2019-05-05T06:20:06Z Denton Liu liu.denton@gmail.com 2019-04-29T08:28:14Z urn:sha1:554544276a604c144df45efcb060c80aa322088c There has been a push to remove extern from function declarations. Remove some instances of "extern" for function declarations which are caught by Coccinelle. Note that Coccinelle has some difficulty with processing functions with `__attribute__` or varargs so some `extern` declarations are left behind to be dealt with in a future patch. This was the Coccinelle patch used: @@ type T; identifier f; @@ - extern T f(...); and it was run with: $ git ls-files \*.{c,h} | grep -v ^compat/ | xargs spatch --sp-file contrib/coccinelle/noextern.cocci --in-place Files under `compat/` are intentionally excluded as some are directly copied from external sources and we should avoid churning them as much as possible. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2019-04-08T08:26:33Z Nguyễn Thái Ngọc Duy pclouds@gmail.com 2019-04-06T11:34:30Z urn:sha1:7fdff47432bbb591b6e44ebab48e1f206521cd1b Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2019-04-08T08:26:33Z Nguyễn Thái Ngọc Duy pclouds@gmail.com 2019-04-06T11:34:29Z urn:sha1:567009033f7ef4619c890f0e07d7e0b67136e1b1 Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2019-04-08T08:26:33Z Nguyễn Thái Ngọc Duy pclouds@gmail.com 2019-04-06T11:34:28Z urn:sha1:d8984c532a18419cdbc69641f981a0a4f553729c Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2019-04-08T08:26:33Z Nguyễn Thái Ngọc Duy pclouds@gmail.com 2019-04-06T11:34:27Z urn:sha1:0b1dbf53dfeed20bd9bc34631e04c5db37ee6121 Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2019-04-08T08:26:32Z Nguyễn Thái Ngọc Duy pclouds@gmail.com 2019-04-06T11:34:25Z urn:sha1:546edf37ae427cf5fdb8c00d1820df73cd16eed6 Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2018-11-13T13:37:26Z Junio C Hamano gitster@pobox.com 2018-11-13T13:37:26Z urn:sha1:e146cc97be4c054c60d38e9f4edcdc33205bf563 The code to traverse objects for reachability, used to decide what objects are unreferenced and expendable, have been taught to also consider per-worktree refs of other worktrees as starting points to prevent data loss. * nd/per-worktree-ref-iteration: git-worktree.txt: correct linkgit command name reflog expire: cover reflog from all worktrees fsck: check HEAD and reflog from other worktrees fsck: move fsck_head_link() to get_default_heads() to avoid some globals revision.c: better error reporting on ref from different worktrees revision.c: correct a parameter name refs: new ref types to make per-worktree refs visible to all worktrees Add a place for (not) sharing stuff between worktrees refs.c: indent with tabs, not spaces 2018-10-22T04:32:29Z Nguyễn Thái Ngọc Duy pclouds@gmail.com 2018-10-21T08:08:54Z urn:sha1:3a3b9d8cde4ed647b1c56a8097f6db8e269bbc71 One of the problems with multiple worktree is accessing per-worktree refs of one worktree from another worktree. This was sort of solved by multiple ref store, where the code can open the ref store of another worktree and has access to the ref space of that worktree. The problem with this is reporting. "HEAD" in another ref space is also called "HEAD" like in the current ref space. In order to differentiate them, all the code must somehow carry the ref store around and print something like "HEAD from this ref store". But that is not feasible (or possible with a _lot_ of work). With the current design, we pass a reference around as a string (so called "refname"). Extending this design to pass a string _and_ a ref store is a nightmare, especially when handling extended SHA-1 syntax. So we do it another way. Instead of entering a separate ref space, we make refs from other worktrees available in the current ref space. So "HEAD" is always HEAD of the current worktree, but then we can have "worktrees/blah/HEAD" to denote HEAD from a worktree named "blah". This syntax coincidentally matches the underlying directory structure which makes implementation a bit easier. The main worktree has to be treated specially because well... it's special from the beginning. So HEAD from the main worktree is acccessible via the name "main-worktree/HEAD" instead of "worktrees/main/HEAD" because "main" could be just another secondary worktree. This patch also makes it possible to specify refs from one worktree in another one, e.g. git log worktrees/foo/HEAD Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2018-10-16T07:15:59Z Junio C Hamano gitster@pobox.com 2018-10-16T07:15:59Z urn:sha1:6d8f8ebb74d21b51cfbf427a436094134af36ee2 The recently introduced commit-graph auxiliary data is incompatible with mechanisms such as replace & grafts that "breaks" immutable nature of the object reference relationship. Disable optimizations based on its use (and updating existing commit-graph) when these incompatible features are in use in the repository. * ds/commit-graph-with-grafts: commit-graph: close_commit_graph before shallow walk commit-graph: not compatible with uninitialized repo commit-graph: not compatible with grafts commit-graph: not compatible with replace objects test-repository: properly init repo commit-graph: update design document refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback refs.c: migrate internal ref iteration to pass thru repository argument