2009-01-23 10:06:53 +01:00
|
|
|
#include "cache.h"
|
2018-04-12 02:21:04 +02:00
|
|
|
#include "oidmap.h"
|
2018-04-12 02:21:05 +02:00
|
|
|
#include "object-store.h"
|
|
|
|
#include "replace-object.h"
|
2009-01-23 10:06:53 +01:00
|
|
|
#include "refs.h"
|
2018-04-12 02:21:05 +02:00
|
|
|
#include "repository.h"
|
Fix sparse warnings
Fix warnings from 'make check'.
- These files don't include 'builtin.h' causing sparse to complain that
cmd_* isn't declared:
builtin/clone.c:364, builtin/fetch-pack.c:797,
builtin/fmt-merge-msg.c:34, builtin/hash-object.c:78,
builtin/merge-index.c:69, builtin/merge-recursive.c:22
builtin/merge-tree.c:341, builtin/mktag.c:156, builtin/notes.c:426
builtin/notes.c:822, builtin/pack-redundant.c:596,
builtin/pack-refs.c:10, builtin/patch-id.c:60, builtin/patch-id.c:149,
builtin/remote.c:1512, builtin/remote-ext.c:240,
builtin/remote-fd.c:53, builtin/reset.c:236, builtin/send-pack.c:384,
builtin/unpack-file.c:25, builtin/var.c:75
- These files have symbols which should be marked static since they're
only file scope:
submodule.c:12, diff.c:631, replace_object.c:92, submodule.c:13,
submodule.c:14, trace.c:78, transport.c:195, transport-helper.c:79,
unpack-trees.c:19, url.c:3, url.c:18, url.c:104, url.c:117, url.c:123,
url.c:129, url.c:136, thread-utils.c:21, thread-utils.c:48
- These files redeclare symbols to be different types:
builtin/index-pack.c:210, parse-options.c:564, parse-options.c:571,
usage.c:49, usage.c:58, usage.c:63, usage.c:72
- These files use a literal integer 0 when they really should use a NULL
pointer:
daemon.c:663, fast-import.c:2942, imap-send.c:1072, notes-merge.c:362
While we're in the area, clean up some unused #includes in builtin files
(mostly exec_cmd.h).
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-03-22 08:51:05 +01:00
|
|
|
#include "commit.h"
|
2009-01-23 10:06:53 +01:00
|
|
|
|
2018-08-20 20:24:19 +02:00
|
|
|
static int register_replace_ref(struct repository *r,
|
|
|
|
const char *refname,
|
2015-05-25 20:39:02 +02:00
|
|
|
const struct object_id *oid,
|
2009-01-23 10:06:53 +01:00
|
|
|
int flag, void *cb_data)
|
|
|
|
{
|
|
|
|
/* Get sha1 from refname */
|
|
|
|
const char *slash = strrchr(refname, '/');
|
|
|
|
const char *hash = slash ? slash + 1 : refname;
|
|
|
|
struct replace_object *repl_obj = xmalloc(sizeof(*repl_obj));
|
|
|
|
|
2018-04-12 02:21:04 +02:00
|
|
|
if (get_oid_hex(hash, &repl_obj->original.oid)) {
|
2009-01-23 10:06:53 +01:00
|
|
|
free(repl_obj);
|
2018-07-21 09:49:37 +02:00
|
|
|
warning(_("bad replace ref name: %s"), refname);
|
2009-01-23 10:06:53 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Copy sha1 from the read ref */
|
2018-03-12 03:27:33 +01:00
|
|
|
oidcpy(&repl_obj->replacement, oid);
|
2009-01-23 10:06:53 +01:00
|
|
|
|
|
|
|
/* Register new object */
|
2018-08-20 20:24:19 +02:00
|
|
|
if (oidmap_put(r->objects->replace_map, repl_obj))
|
2018-07-21 09:49:37 +02:00
|
|
|
die(_("duplicate replace ref: %s"), refname);
|
2009-01-23 10:06:53 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-08-20 20:24:27 +02:00
|
|
|
void prepare_replace_object(struct repository *r)
|
2009-01-23 10:06:53 +01:00
|
|
|
{
|
2018-04-12 02:21:16 +02:00
|
|
|
if (r->objects->replace_map)
|
2009-01-23 10:06:53 +01:00
|
|
|
return;
|
|
|
|
|
2018-04-12 02:21:16 +02:00
|
|
|
r->objects->replace_map =
|
2018-05-10 01:40:59 +02:00
|
|
|
xmalloc(sizeof(*r->objects->replace_map));
|
2018-04-12 02:21:16 +02:00
|
|
|
oidmap_init(r->objects->replace_map, 0);
|
2018-04-12 02:21:07 +02:00
|
|
|
|
2018-04-12 02:21:16 +02:00
|
|
|
for_each_replace_ref(r, register_replace_ref, NULL);
|
2009-01-23 10:06:53 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* We allow "recursive" replacement. Only within reason, though */
|
|
|
|
#define MAXREPLACEDEPTH 5
|
|
|
|
|
2014-02-28 17:29:16 +01:00
|
|
|
/*
|
2018-03-12 03:27:54 +01:00
|
|
|
* If a replacement for object oid has been set up, return the
|
2014-02-28 17:29:16 +01:00
|
|
|
* replacement object's name (replaced recursively, if necessary).
|
2018-03-12 03:27:54 +01:00
|
|
|
* The return value is either oid or a pointer to a
|
2014-02-28 17:29:16 +01:00
|
|
|
* permanently-allocated value. This function always respects replace
|
2018-07-18 22:45:20 +02:00
|
|
|
* references, regardless of the value of read_replace_refs.
|
2014-02-28 17:29:16 +01:00
|
|
|
*/
|
2018-04-12 02:21:17 +02:00
|
|
|
const struct object_id *do_lookup_replace_object(struct repository *r,
|
|
|
|
const struct object_id *oid)
|
2009-01-23 10:06:53 +01:00
|
|
|
{
|
2018-04-12 02:21:04 +02:00
|
|
|
int depth = MAXREPLACEDEPTH;
|
2018-03-12 03:27:54 +01:00
|
|
|
const struct object_id *cur = oid;
|
2009-01-23 10:06:53 +01:00
|
|
|
|
2018-04-12 02:21:17 +02:00
|
|
|
prepare_replace_object(r);
|
2009-01-23 10:06:53 +01:00
|
|
|
|
|
|
|
/* Try to recursively replace the object */
|
2018-04-12 02:21:04 +02:00
|
|
|
while (depth-- > 0) {
|
2018-04-12 02:21:05 +02:00
|
|
|
struct replace_object *repl_obj =
|
2018-04-12 02:21:17 +02:00
|
|
|
oidmap_get(r->objects->replace_map, cur);
|
2018-04-12 02:21:04 +02:00
|
|
|
if (!repl_obj)
|
|
|
|
return cur;
|
|
|
|
cur = &repl_obj->replacement;
|
|
|
|
}
|
2018-07-21 09:49:37 +02:00
|
|
|
die(_("replace depth too high for object %s"), oid_to_hex(oid));
|
2009-01-23 10:06:53 +01:00
|
|
|
}
|