summaryrefslogtreecommitdiff
path: root/epoch.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-02-28 23:07:20 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-01 09:45:50 (GMT)
commit765ac8ec469f110e88376e4fac05d0ed475bcb28 (patch)
tree151dd9135fb335aeffc4b0e4406c8c4cf8b27e2c /epoch.h
parent70b006b9712b57741ec1320b15aef2f8b1d6a905 (diff)
downloadgit-765ac8ec469f110e88376e4fac05d0ed475bcb28.zip
git-765ac8ec469f110e88376e4fac05d0ed475bcb28.tar.gz
git-765ac8ec469f110e88376e4fac05d0ed475bcb28.tar.bz2
Rip out merge-order and make "git log <paths>..." work again.
Well, assuming breaking --merge-order is fine, here's a patch (on top of the other ones) that makes git log <filename> actually work, as far as I can tell. I didn't add the logic for --before/--after flags, but that should be pretty trivial, and is independent of this anyway. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'epoch.h')
-rw-r--r--epoch.h20
1 files changed, 0 insertions, 20 deletions
diff --git a/epoch.h b/epoch.h
deleted file mode 100644
index 3756009..0000000
--- a/epoch.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef EPOCH_H
-#define EPOCH_H
-
-
-// return codes for emitter_func
-#define STOP 0
-#define CONTINUE 1
-#define DO 2
-typedef int (*emitter_func) (struct commit *);
-
-int sort_list_in_merge_order(struct commit_list *list, emitter_func emitter);
-
-/* Low bits are used by rev-list */
-#define BOUNDARY (1u<<11)
-#define VISITED (1u<<12)
-#define DISCONTINUITY (1u<<13)
-#define LAST_EPOCH_FLAG (1u<<14)
-
-
-#endif /* EPOCH_H */