OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cache.h: document index_name_pos
[git-core/git.git]
/
unpack-trees.c
diff --git
a/unpack-trees.c
b/unpack-trees.c
index
2a963f9
..
7a6df99
100644
(file)
--- a/
unpack-trees.c
+++ b/
unpack-trees.c
@@
-78,7
+78,7
@@
void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
xstrfmt(msg, cmd, cmd);
msgs[ERROR_NOT_UPTODATE_DIR] =
xstrfmt(msg, cmd, cmd);
msgs[ERROR_NOT_UPTODATE_DIR] =
- _("Updating the following directories would lose untracked files in
it
:\n%s");
+ _("Updating the following directories would lose untracked files in
them
:\n%s");
if (!strcmp(cmd, "checkout"))
msg = advice_commit_before_merge
if (!strcmp(cmd, "checkout"))
msg = advice_commit_before_merge
@@
-625,7
+625,7
@@
static struct cache_entry *create_ce_entry(const struct traverse_info *info, con
ce->ce_mode = create_ce_mode(n->mode);
ce->ce_flags = create_ce_flags(stage);
ce->ce_namelen = len;
ce->ce_mode = create_ce_mode(n->mode);
ce->ce_flags = create_ce_flags(stage);
ce->ce_namelen = len;
-
hashcpy(ce->sha1, n->oid->hash
);
+
oidcpy(&ce->oid, n->oid
);
make_traverse_path(ce->name, info, n);
return ce;
make_traverse_path(ce->name, info, n);
return ce;
@@
-1094,12
+1094,10
@@
int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
int i, ret;
static struct cache_entry *dfc;
struct exclude_list el;
int i, ret;
static struct cache_entry *dfc;
struct exclude_list el;
- struct checkout state;
+ struct checkout state
= CHECKOUT_INIT
;
if (len > MAX_UNPACK_TREES)
die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
if (len > MAX_UNPACK_TREES)
die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
- memset(&state, 0, sizeof(state));
- state.base_dir = "";
state.force = 1;
state.quiet = 1;
state.refresh_cache = 1;
state.force = 1;
state.quiet = 1;
state.refresh_cache = 1;
@@
-1288,7
+1286,7
@@
static int same(const struct cache_entry *a, const struct cache_entry *b)
if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED)
return 0;
return a->ce_mode == b->ce_mode &&
if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED)
return 0;
return a->ce_mode == b->ce_mode &&
- !
hashcmp(a->sha1, b->sha1
);
+ !
oidcmp(&a->oid, &b->oid
);
}
}
@@
-1394,7
+1392,7
@@
static int verify_clean_subdirectory(const struct cache_entry *ce,
/* If we are not going to update the submodule, then
* we don't care.
*/
/* If we are not going to update the submodule, then
* we don't care.
*/
- if (!hashcmp(sha1, ce->
sha1
))
+ if (!hashcmp(sha1, ce->
oid.hash
))
return 0;
return verify_clean_submodule(ce, error_type, o);
}
return 0;
return verify_clean_submodule(ce, error_type, o);
}
@@
-1666,7
+1664,7
@@
static void show_stage_entry(FILE *o,
fprintf(o, "%s%06o %s %d\t%s\n",
label,
ce->ce_mode,
fprintf(o, "%s%06o %s %d\t%s\n",
label,
ce->ce_mode,
-
sha1_to_hex(ce->sha1
),
+
oid_to_hex(&ce->oid
),
ce_stage(ce),
ce->name);
}
ce_stage(ce),
ce->name);
}