summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Kestenholz <matthias@spinlock.ch>2006-08-02 21:52:00 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-03 00:05:21 (GMT)
commit25f38f064f7f9ccde337eafcf575e4a5a1079346 (patch)
tree94c5aff7d29e55e80dc23787945a75ab1f0d3e1e
parente12c095aa69d8aca0326eb11960427d9bf9e2db7 (diff)
downloadgit-25f38f064f7f9ccde337eafcf575e4a5a1079346.zip
git-25f38f064f7f9ccde337eafcf575e4a5a1079346.tar.gz
git-25f38f064f7f9ccde337eafcf575e4a5a1079346.tar.bz2
use declarations from builtin.h for builtin commands
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--builtin-fmt-merge-msg.c3
-rw-r--r--builtin-prune-packed.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index c84224e..485ede7 100644
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
#include "cache.h"
#include "commit.h"
#include "diff.h"
@@ -242,7 +243,7 @@ static void shortlog(const char *name, unsigned char *sha1,
free_list(&subjects);
}
-int cmd_fmt_merge_msg(int argc, char **argv, const char *prefix)
+int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
{
int limit = 20, i = 0;
char line[1024];
diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c
index d0ff336..d3dd94d 100644
--- a/builtin-prune-packed.c
+++ b/builtin-prune-packed.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
#include "cache.h"
static const char prune_packed_usage[] =
@@ -54,7 +55,7 @@ static void prune_packed_objects(void)
}
}
-int cmd_prune_packed(int argc, char **argv, const char *prefix)
+int cmd_prune_packed(int argc, const char **argv, const char *prefix)
{
int i;