From: Johannes Schindelin <Johannes.Schindelin@xxxxxx>
This will be required by fast-export, when no commits were
exported, but the refs should be set, of course.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@xxxxxx>
Signed-off-by: Sverre Rabbelier <srabbelier@xxxxxxxxx>
---
This is just in preperation of fixing the actual bug.
object.h | 2 +-
revision.c | 12 +++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/object.h b/object.h
index b6618d9..a28cd45 100644
--- a/object.h
+++ b/object.h
@@ -12,7 +12,7 @@ struct object_array {
struct object_array_entry {
struct object *item;
const char *name;
- unsigned mode;
+ unsigned mode, flags;
} *objects;
};
diff --git a/revision.c b/revision.c
index c46cfaa..72c3ee5 100644
--- a/revision.c
+++ b/revision.c
@@ -131,7 +131,7 @@ void mark_parents_uninteresting(struct commit *commit)
}
}
-static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode)
+static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode, unsigned flags)
{
if (!obj)
return;
@@ -152,11 +152,12 @@ static void add_pending_object_with_mode(struct rev_info *revs, struct object *o
return;
}
add_object_array_with_mode(obj, name, &revs->pending, mode);
+ revs->pending.objects[revs->pending.nr-1].flags = flags;
}
void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
{
- add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
+ add_pending_object_with_mode(revs, obj, name, S_IFINVALID, 0);
}
void add_head_to_pending(struct rev_info *revs)
@@ -1073,7 +1074,8 @@ int handle_revision_arg(const char *arg, struct rev_info *revs,
} else
a->object.flags |= flags_exclude;
b->object.flags |= flags;
- add_pending_object(revs, &a->object, this);
+ add_pending_object_with_mode(revs, &a->object, this,
+ S_IFINVALID, flags_exclude);
add_pending_object(revs, &b->object, next);
return 0;
}
@@ -1103,7 +1105,7 @@ int handle_revision_arg(const char *arg, struct rev_info *revs,
if (!cant_be_filename)
verify_non_filename(revs->prefix, arg);
object = get_reference(revs, arg, sha1, flags ^ local_flags);
- add_pending_object_with_mode(revs, object, arg, mode);
+ add_pending_object_with_mode(revs, object, arg, mode, local_flags);
return 0;
}
@@ -1708,7 +1710,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
if (get_sha1_with_mode(revs->def, sha1, &mode))
die("bad default revision '%s'", revs->def);
object = get_reference(revs, revs->def, sha1, 0);
- add_pending_object_with_mode(revs, object, revs->def, mode);
+ add_pending_object_with_mode(revs, object, revs->def, mode, 0);
}
/* Did the user ask for any diff output? Run the diff! */
--
1.7.6.385.g91185.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html