From: Junio C Hamano <junkio@cox.net>
Date: Wed, 27 Dec 2006 07:47:40 +0000 (-0800)
Subject: Merge branch 'jc/fsck-reflog'
X-Git-Tag: v1.5.0-rc1~188
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e8b4029f990907e24fac0e7772ee19ee6dd55c1c;p=git.git

Merge branch 'jc/fsck-reflog'

* jc/fsck-reflog:
  Add git-reflog to .gitignore
  reflog expire: do not punt on tags that point at non commits.
  reflog expire: prune commits that are not incomplete
  Don't crash during repack of a reflog with pruned commits.
  git reflog expire
  Move in_merge_bases() to commit.c
  reflog: fix warning message.
  Teach git-repack to preserve objects referred to by reflog entries.
  Protect commits recorded in reflog from pruning.
  add for_each_reflog_ent() iterator
---

e8b4029f990907e24fac0e7772ee19ee6dd55c1c
diff --cc Makefile
index 475047f10,d4d8590b6..52d4a3a86
--- a/Makefile
+++ b/Makefile
@@@ -287,8 -288,8 +287,9 @@@ BUILTIN_OBJS = 
  	builtin-prune-packed.o \
  	builtin-push.o \
  	builtin-read-tree.o \
+ 	builtin-reflog.o \
  	builtin-repo-config.o \
 +	builtin-rerere.o \
  	builtin-rev-list.o \
  	builtin-rev-parse.o \
  	builtin-rm.o \
diff --cc builtin.h
index 8ffd8b265,fdc0907ec..df72d0944
--- a/builtin.h
+++ b/builtin.h
@@@ -51,8 -51,8 +51,9 @@@ extern int cmd_prune(int argc, const ch
  extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);
  extern int cmd_push(int argc, const char **argv, const char *prefix);
  extern int cmd_read_tree(int argc, const char **argv, const char *prefix);
+ extern int cmd_reflog(int argc, const char **argv, const char *prefix);
  extern int cmd_repo_config(int argc, const char **argv, const char *prefix);
 +extern int cmd_rerere(int argc, const char **argv, const char *prefix);
  extern int cmd_rev_list(int argc, const char **argv, const char *prefix);
  extern int cmd_rev_parse(int argc, const char **argv, const char *prefix);
  extern int cmd_rm(int argc, const char **argv, const char *prefix);
diff --cc git.c
index e732a098f,5822296e6..50ebd869a
--- a/git.c
+++ b/git.c
@@@ -246,8 -244,8 +246,9 @@@ static void handle_internal_command(in
  		{ "prune-packed", cmd_prune_packed, RUN_SETUP },
  		{ "push", cmd_push, RUN_SETUP },
  		{ "read-tree", cmd_read_tree, RUN_SETUP },
+ 		{ "reflog", cmd_reflog, RUN_SETUP },
  		{ "repo-config", cmd_repo_config },
 +		{ "rerere", cmd_rerere, RUN_SETUP },
  		{ "rev-list", cmd_rev_list, RUN_SETUP },
  		{ "rev-parse", cmd_rev_parse, RUN_SETUP },
  		{ "rm", cmd_rm, RUN_SETUP },