summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-05-20 18:40:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-21 04:23:14 (GMT)
commit65b5f9483eafea0ccdea59884da4e00e0cfeee1f (patch)
treea6ffd68d8ba419391d7224d8ca3330ffbd0ad87f
parentd9fcc7f8715c22b315146594afa19b75b9568dd3 (diff)
downloadgit-65b5f9483eafea0ccdea59884da4e00e0cfeee1f.zip
git-65b5f9483eafea0ccdea59884da4e00e0cfeee1f.tar.gz
git-65b5f9483eafea0ccdea59884da4e00e0cfeee1f.tar.bz2
Move declaration for alias.c to alias.h
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--alias.c1
-rw-r--r--alias.h9
-rw-r--r--builtin/help.c1
-rw-r--r--builtin/merge.c1
-rw-r--r--cache.h5
-rw-r--r--connect.c1
-rw-r--r--git.c1
-rw-r--r--pager.c1
-rw-r--r--sequencer.c1
-rw-r--r--shell.c1
10 files changed, 17 insertions, 5 deletions
diff --git a/alias.c b/alias.c
index bf146e5..e9726ce 100644
--- a/alias.c
+++ b/alias.c
@@ -1,4 +1,5 @@
#include "cache.h"
+#include "alias.h"
#include "config.h"
struct config_alias_data {
diff --git a/alias.h b/alias.h
new file mode 100644
index 0000000..fbf1d22
--- /dev/null
+++ b/alias.h
@@ -0,0 +1,9 @@
+#ifndef __ALIAS_H__
+#define __ALIAS_H__
+
+char *alias_lookup(const char *alias);
+int split_cmdline(char *cmdline, const char ***argv);
+/* Takes a negative value returned by split_cmdline */
+const char *split_cmdline_strerror(int cmdline_errno);
+
+#endif
diff --git a/builtin/help.c b/builtin/help.c
index 5727fb5..6b4b3df 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -9,6 +9,7 @@
#include "run-command.h"
#include "column.h"
#include "help.h"
+#include "alias.h"
#ifndef DEFAULT_HELP_FORMAT
#define DEFAULT_HELP_FORMAT "man"
diff --git a/builtin/merge.c b/builtin/merge.c
index 9db5a2c..e3681cd 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -34,6 +34,7 @@
#include "string-list.h"
#include "packfile.h"
#include "tag.h"
+#include "alias.h"
#define DEFAULT_TWOHEAD (1<<0)
#define DEFAULT_OCTOPUS (1<<1)
diff --git a/cache.h b/cache.h
index bbaf5c3..111116e 100644
--- a/cache.h
+++ b/cache.h
@@ -1835,11 +1835,6 @@ extern int ws_blank_line(const char *line, int len, unsigned ws_rule);
void overlay_tree_on_index(struct index_state *istate,
const char *tree_name, const char *prefix);
-char *alias_lookup(const char *alias);
-int split_cmdline(char *cmdline, const char ***argv);
-/* Takes a negative value returned by split_cmdline */
-const char *split_cmdline_strerror(int cmdline_errno);
-
/* setup.c */
struct startup_info {
int have_repository;
diff --git a/connect.c b/connect.c
index c3a014c..ff078d2 100644
--- a/connect.c
+++ b/connect.c
@@ -13,6 +13,7 @@
#include "transport.h"
#include "strbuf.h"
#include "protocol.h"
+#include "alias.h"
static char *server_capabilities;
static const char *parse_feature_value(const char *, const char *, int *);
diff --git a/git.c b/git.c
index 4d5b8a9..19f73b3 100644
--- a/git.c
+++ b/git.c
@@ -3,6 +3,7 @@
#include "exec_cmd.h"
#include "help.h"
#include "run-command.h"
+#include "alias.h"
#define RUN_SETUP (1<<0)
#define RUN_SETUP_GENTLY (1<<1)
diff --git a/pager.c b/pager.c
index 92b23e6..1f4688f 100644
--- a/pager.c
+++ b/pager.c
@@ -2,6 +2,7 @@
#include "config.h"
#include "run-command.h"
#include "sigchain.h"
+#include "alias.h"
#ifndef DEFAULT_PAGER
#define DEFAULT_PAGER "less"
diff --git a/sequencer.c b/sequencer.c
index 667f35e..1288a36 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -23,6 +23,7 @@
#include "hashmap.h"
#include "notes-utils.h"
#include "sigchain.h"
+#include "alias.h"
#define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
diff --git a/shell.c b/shell.c
index 234b2d4..3ce77b8 100644
--- a/shell.c
+++ b/shell.c
@@ -3,6 +3,7 @@
#include "exec_cmd.h"
#include "strbuf.h"
#include "run-command.h"
+#include "alias.h"
#define COMMAND_DIR "git-shell-commands"
#define HELP_COMMAND COMMAND_DIR "/help"