summaryrefslogtreecommitdiff
path: root/unpack-trees.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-02 22:06:59 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-04 07:19:28 (GMT)
commit9a4d8fdc25d6ba08564766c6ded165212f423b61 (patch)
tree34b5061bdbc8002f500e0af8effd3ca5e662fb70 /unpack-trees.h
parent7f7932ab25f2ddd6080c8b1e8bfd698e523eb7d4 (diff)
downloadgit-9a4d8fdc25d6ba08564766c6ded165212f423b61.zip
git-9a4d8fdc25d6ba08564766c6ded165212f423b61.tar.gz
git-9a4d8fdc25d6ba08564766c6ded165212f423b61.tar.bz2
unpack-trees: get rid of *indpos parameter.
This variable keeps track of which entry in the original index the traversal is looking at, and belongs to the unpack_trees_options structure along with other traversal status information. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'unpack-trees.h')
-rw-r--r--unpack-trees.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h
index 191f744..fee7da4 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -16,6 +16,7 @@ struct unpack_trees_options {
int verbose_update;
int aggressive;
const char *prefix;
+ int pos;
struct dir_struct *dir;
merge_fn_t fn;