So that it's possible to remove certain refs from the list without
removing the objects that are referenced by other refs.
For example this repository:
C (crap)
B (test)
A (HEAD, master)
When using '--branches --except crap':
B (test)
A (HEAD, master)
But when using '--branches --not crap' nothing will come out.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
I don't like the complexity of recalculate_flag(), but it seems to be the most
straight-forward way of making --not and --except work.
Documentation/git-rev-parse.txt| 6
contrib/completion/git-completion.bash | 2 +-
revision.c | 52 -
revision.h | 3 +-
t/t6112-rev-list-except.sh | 60 ++
5 files changed, 120 insertions(+), 3 deletions(-)
create mode 100755 t/t6112-rev-list-except.sh
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 2b126c0..fe5cc6b 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -110,6 +110,12 @@ can be used.
strip '{caret}' prefix from the object names that already have
one.
+--except::
+ Skip the following object names. For example:
+ '--branches --except master' will show all the branches, except master.
+ This differs from --not in that --except will still show the object, if
+ they are referenced by another object name.
+
--symbolic::
Usually the object names are output in SHA-1 form (with
possible '{caret}' prefix); this option makes them output in a
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 5da920e..aed8c12 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1386,7 +1386,7 @@ _git_ls_tree ()
# Options that go well for log, shortlog and gitk
__git_log_common_options=
- --not --all
+ --not --except --all
--branches --tags --remotes
--first-parent --merges --no-merges
--max-count=
diff --git a/revision.c b/revision.c
index 84ccc05..a7664dd 100644
--- a/revision.c
+++ b/revision.c
@@ -1984,6 +1984,8 @@ static int handle_revision_pseudo_opt(const char
*submodule,
handle_reflog(revs, *flags);
} else if (!strcmp(arg, --not)) {
*flags ^= UNINTERESTING | BOTTOM;
+ } else if (!strcmp(arg, --except)) {
+ *flags |= SKIP;
} else if (!strcmp(arg, --no-walk)) {
revs-no_walk = REVISION_WALK_NO_WALK_SORTED;
} else if (!prefixcmp(arg, --no-walk=)) {
@@ -2573,24 +2575,72 @@ void reset_revision_walk(void)
clear_object_flags(SEEN | ADDED | SHOWN);
}
+static int refcmp(const char *a, const char *b)
+{
+ a = prettify_refname(a);
+ if (*a == '^')
+ a++;
+ b = prettify_refname(b);
+ if (*b == '^')
+ b++;
+ return strcmp(a, b);
+}
+
+static int recalculate_flag(struct rev_info *revs, unsigned char *sha1, const
char *name)
+{
+ int flags = 0;
+ int i;
+ for (i = 0; i revs-cmdline.nr; i++) {
+ struct object *object;
+ struct rev_cmdline_entry *ce;
+ ce = revs-cmdline.rev[i];
+ object = ce-item;
+ while (object-type == OBJ_TAG) {
+ struct tag *tag = (struct tag *) object;
+ if (!tag-tagged)
+ continue;
+ object = parse_object(tag-tagged-sha1);
+ if (!object)
+ continue;
+ }
+ if (hashcmp(object-sha1, sha1))
+ continue;
+ if (!strcmp(ce-name, name))
+ continue;
+ flags |= ce-flags;
+ }
+ return flags;
+}
+
int prepare_revision_walk(struct rev_info *revs)
{
int nr = revs-pending.nr;
struct object_array_entry *e, *list;
struct commit_list **next = revs-commits;
+ int i;
e = list = revs-pending.objects;
revs-pending.nr = 0;
revs-pending.alloc = 0;
revs-pending.objects = NULL;
while (--nr = 0) {
- struct commit *commit = handle_commit(revs, e-item, e-name);
+ struct commit *commit;
+ for (i = 0; i revs-cmdline.nr; i++) {
+ struct rev_cmdline_entry *ce;
+ ce = revs-cmdline.rev[i];
+ if ((ce-flags SKIP) !refcmp(ce-name, e-name)) {
+ e-item-flags = recalculate_flag(revs,
e-item-sha1, ce-name);
+ goto next;
+ }
+ }
+ commit = handle_commit(revs, e-item, e-name);
if (commit) {
if
