Staging
v0.8.1
v0.8.1
Revision e88aab917e0dc3e99af8fb0f3ecbef66ac3e49b6 authored by Derrick Stolee on 24 October 2019, 13:40:41 UTC, committed by Junio C Hamano on 25 October 2019, 02:19:14 UTC
While dogfooding, Johannes found a bug in the fetch.writeCommitGraph config behavior. His example initially happened during a clone with --recurse-submodules, we found that this happens with the first fetch after cloning a repository that contains a submodule: $ git clone <url> test $ cd test $ git -c fetch.writeCommitGraph=true fetch origin Computing commit graph generation numbers: 100% (12/12), done. BUG: commit-graph.c:886: missing parent <hash1> for commit <hash2> Aborted (core dumped) In the repo I had cloned, there were really 60 commits to scan, but only 12 were in the list to write when calling compute_generation_numbers(). A commit in the list expects to see a parent, but that parent is not in the list. A follow-up will fix the bug, but first we create a test that demonstrates the problem. This test must be careful about an existing commit-graph file, since GIT_TEST_COMMIT_GRAPH=1 will cause the repo we are cloning to already have one. This then prevents the incremtnal commit-graph write during the first 'git fetch'. Helped-by: Jeff King <peff@peff.net> Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de> Helped-by: Szeder Gábor <szeder.dev@gmail.com> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 50f26bd
chdir-notify.h
#ifndef CHDIR_NOTIFY_H
#define CHDIR_NOTIFY_H
/*
* An API to let code "subscribe" to changes to the current working directory.
* The general idea is that some code asks to be notified when the working
* directory changes, and other code that calls chdir uses a special wrapper
* that notifies everyone.
*/
/*
* Callers who need to know about changes can do:
*
* void foo(const char *old_path, const char *new_path, void *data)
* {
* warning("switched from %s to %s!", old_path, new_path);
* }
* ...
* chdir_notify_register("description", foo, data);
*
* In practice most callers will want to move a relative path to the new root;
* they can use the reparent_relative_path() helper for that. If that's all
* you're doing, you can also use the convenience function:
*
* chdir_notify_reparent("description", &my_path);
*
* Whenever a chdir event occurs, that will update my_path (if it's relative)
* to adjust for the new cwd by freeing any existing string and allocating a
* new one.
*
* Registered functions are called in the order in which they were added. Note
* that there's currently no way to remove a function, so make sure that the
* data parameter remains valid for the rest of the program.
*
* The "name" argument is used only for printing trace output from
* $GIT_TRACE_SETUP. It may be NULL, but if non-NULL should point to
* storage which lasts as long as the registration is active.
*/
typedef void (*chdir_notify_callback)(const char *name,
const char *old_cwd,
const char *new_cwd,
void *data);
void chdir_notify_register(const char *name, chdir_notify_callback cb, void *data);
void chdir_notify_reparent(const char *name, char **path);
/*
*
* Callers that want to chdir:
*
* chdir_notify(new_path);
*
* to switch to the new path and notify any callbacks.
*
* Note that you don't need to chdir_notify() if you're just temporarily moving
* to a directory and back, as long as you don't call any subscribed code in
* between (but it should be safe to do so if you're unsure).
*/
int chdir_notify(const char *new_cwd);
/*
* Reparent a relative path from old_root to new_root. For example:
*
* reparent_relative_path("/a", "/a/b", "b/rel");
*
* would return the (newly allocated) string "rel". Note that we may return an
* absolute path in some cases (e.g., if the resulting path is not inside
* new_cwd).
*/
char *reparent_relative_path(const char *old_cwd,
const char *new_cwd,
const char *path);
#endif /* CHDIR_NOTIFY_H */
Computing file changes ...