From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Feb 2008 19:55:43 +0000 (-0800)
Subject: Merge branch 'jk/help-alias'
X-Git-Tag: v1.5.5-rc0~137
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d87aa329354be3d93c70547f4ed6fe52103ed1b5?hp=-c

Merge branch 'jk/help-alias'

* jk/help-alias:
help: respect aliases
make alias lookup a public, procedural function
help: use parseopt
---

d87aa329354be3d93c70547f4ed6fe52103ed1b5
diff --combined Makefile
index cc635296a3,b460bb2164..8d9f11e75e
--- a/Makefile
+++ b/Makefile
@@@ -327,7 -327,8 +327,8 @@@ LIB_OBJS = 
  	alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
  	color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \
  	convert.o attr.o decorate.o progress.o mailmap.o symlinks.o remote.o \
- 	transport.o bundle.o walker.o parse-options.o ws.o archive.o
+ 	transport.o bundle.o walker.o parse-options.o ws.o archive.o \
+ 	alias.o
  
  BUILTIN_OBJS = \
  	builtin-add.o \
@@@ -741,7 -742,6 +742,7 @@@ endi
  ifdef THREADED_DELTA_SEARCH
  	BASIC_CFLAGS += -DTHREADED_DELTA_SEARCH
  	EXTLIBS += -lpthread
 +	LIB_OBJS += thread-utils.o
  endif
  
  ifeq ($(TCLTK_PATH),)
@@@ -1103,7 -1103,7 +1104,7 @@@ git.spec: git.spec.i
  	mv $@+ $@
  
  GIT_TARNAME=git-$(GIT_VERSION)
 -dist: git.spec git-archive configure
 +dist: git.spec git-archive$(X) configure
  	./git-archive --format=tar \
  		--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
  	@mkdir -p $(GIT_TARNAME)
diff --combined cache.h
index 922bed9212,1e9c937299..7769f055e9
--- a/cache.h
+++ b/cache.h
@@@ -698,7 -698,6 +698,7 @@@ extern const char *git_log_output_encod
  /* IO helper functions */
  extern void maybe_flush_or_die(FILE *, const char *);
  extern int copy_fd(int ifd, int ofd);
 +extern int copy_file(const char *dst, const char *src, int mode);
  extern int read_in_full(int fd, void *buf, size_t count);
  extern int write_in_full(int fd, const void *buf, size_t count);
  extern void write_or_die(int fd, const void *buf, size_t count);
@@@ -752,7 -751,6 +752,7 @@@ void shift_tree(const unsigned char *, 
  #define WS_TRAILING_SPACE	01
  #define WS_SPACE_BEFORE_TAB	02
  #define WS_INDENT_WITH_NON_TAB	04
 +#define WS_CR_AT_EOL           010
  #define WS_DEFAULT_RULE (WS_TRAILING_SPACE|WS_SPACE_BEFORE_TAB)
  extern unsigned whitespace_rule_cfg;
  extern unsigned whitespace_rule(const char *);
@@@ -761,11 -759,12 +761,13 @@@ extern unsigned check_and_emit_line(con
      FILE *stream, const char *set,
      const char *reset, const char *ws);
  extern char *whitespace_error_string(unsigned ws);
 +extern int ws_fix_copy(char *, const char *, int, unsigned, int *);
  
  /* ls-files */
  int pathspec_match(const char **spec, char *matched, const char *filename, int skiplen);
  int report_path_error(const char *ps_matched, const char **pathspec, int prefix_offset);
  void overlay_tree_on_cache(const char *tree_name, const char *prefix);
  
+ char *alias_lookup(const char *alias);
+ 
  #endif /* CACHE_H */