global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-11 18:30:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

setup_revisions: remember whether a ref was positive or not

Browse Source 
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@gmx.de>
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
This commit is contained in:
Johannes Schindelin
2011-07-23 17:14:47 +02:00
committed by Pat Thoyts
parent 8a0359aec2
commit 3bd1ca55e6
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
object.h
View File

@@ -12,7 +12,7 @@ struct object_array {
struct object_array_entry {
struct object *item;
const char *name;
unsigned mode;
unsigned mode, flags;
} *objects;
};

12
revision.c
View File

@@ -185,7 +185,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;
@@ -206,11 +206,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)
@@ -1190,7 +1191,8 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi
REV_CMD_LEFT, a_flags);
add_rev_cmdline(revs, &b->object, next,
REV_CMD_RIGHT, 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;
}
@@ -1225,7 +1227,7 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi
verify_non_filename(revs->prefix, arg);
object = get_reference(revs, arg, sha1, flags ^ local_flags);
add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
add_pending_object_with_mode(revs, object, arg, oc.mode);
add_pending_object_with_mode(revs, object, arg, oc.mode, local_flags);
return 0;
}
@@ -1868,7 +1870,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
if (get_sha1_with_context(revs->def, 0, sha1, &oc))
die("bad default revision '%s'", revs->def);
object = get_reference(revs, revs->def, sha1, 0);
add_pending_object_with_mode(revs, object, revs->def, oc.mode);
add_pending_object_with_mode(revs, object, revs->def, oc.mode, 0);
}
/* Did the user ask for any diff output? Run the diff! */