From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 25 Nov 2007 00:31:34 +0000 (-0800)
Subject: Merge branch 'sb/clean'
X-Git-Tag: v1.5.4-rc0~153
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6c6ea3800d1eace51994d90fbeb19ffe918e63b0?ds=inline;hp=-c

Merge branch 'sb/clean'

* sb/clean:
Teach git clean to use setup_standard_excludes()
git-clean: Fix error message if clean.requireForce is not set.
Make git-clean a builtin
---

6c6ea3800d1eace51994d90fbeb19ffe918e63b0
diff --combined Makefile
index bcf1e9eb29,87da99f432..8809b0ace6
--- a/Makefile
+++ b/Makefile
@@@ -213,7 -213,7 +213,7 @@@ BASIC_LDFLAGS 
  
  SCRIPT_SH = \
  	git-bisect.sh git-checkout.sh \
- 	git-clean.sh git-clone.sh git-commit.sh \
+ 	git-clone.sh git-commit.sh \
  	git-ls-remote.sh \
  	git-merge-one-file.sh git-mergetool.sh git-parse-remote.sh \
  	git-pull.sh git-rebase.sh git-rebase--interactive.sh \
@@@ -221,7 -221,7 +221,7 @@@
  	git-sh-setup.sh \
  	git-am.sh \
  	git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
 -	git-merge-resolve.sh git-merge-ours.sh \
 +	git-merge-resolve.sh \
  	git-lost-found.sh git-quiltimport.sh git-submodule.sh \
  	git-filter-branch.sh \
  	git-stash.sh
@@@ -330,6 -330,7 +330,7 @@@ BUILTIN_OBJS = 
  	builtin-check-attr.o \
  	builtin-checkout-index.o \
  	builtin-check-ref-format.o \
+ 	builtin-clean.o \
  	builtin-commit-tree.o \
  	builtin-count-objects.o \
  	builtin-describe.o \
@@@ -353,7 -354,6 +354,7 @@@
  	builtin-mailsplit.o \
  	builtin-merge-base.o \
  	builtin-merge-file.o \
 +	builtin-merge-ours.o \
  	builtin-mv.o \
  	builtin-name-rev.o \
  	builtin-pack-objects.o \
@@@ -754,7 -754,7 +755,7 @@@ TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_
  LIBS = $(GITLIBS) $(EXTLIBS)
  
  BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
 -	-DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $(COMPAT_CFLAGS)
 +	$(COMPAT_CFLAGS)
  LIB_OBJS += $(COMPAT_OBJS)
  
  ALL_CFLAGS += $(BASIC_CFLAGS)
@@@ -903,9 -903,6 +904,9 @@@ exec_cmd.o: exec_cmd.c GIT-CFLAG
  builtin-init-db.o: builtin-init-db.c GIT-CFLAGS
  	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $<
  
 +config.o: config.c GIT-CFLAGS
 +	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $<
 +
  http.o: http.c GIT-CFLAGS
  	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DGIT_USER_AGENT='"git/$(GIT_VERSION)"' $<
  
diff --combined builtin.h
index bcb54aaded,8248f293e6..6ecf12be32
--- a/builtin.h
+++ b/builtin.h
@@@ -24,6 -24,7 +24,7 @@@ extern int cmd_check_attr(int argc, con
  extern int cmd_check_ref_format(int argc, const char **argv, const char *prefix);
  extern int cmd_cherry(int argc, const char **argv, const char *prefix);
  extern int cmd_cherry_pick(int argc, const char **argv, const char *prefix);
+ extern int cmd_clean(int argc, const char **argv, const char *prefix);
  extern int cmd_commit_tree(int argc, const char **argv, const char *prefix);
  extern int cmd_count_objects(int argc, const char **argv, const char *prefix);
  extern int cmd_describe(int argc, const char **argv, const char *prefix);
@@@ -51,7 -52,6 +52,7 @@@ extern int cmd_ls_tree(int argc, const 
  extern int cmd_mailinfo(int argc, const char **argv, const char *prefix);
  extern int cmd_mailsplit(int argc, const char **argv, const char *prefix);
  extern int cmd_merge_base(int argc, const char **argv, const char *prefix);
 +extern int cmd_merge_ours(int argc, const char **argv, const char *prefix);
  extern int cmd_merge_file(int argc, const char **argv, const char *prefix);
  extern int cmd_mv(int argc, const char **argv, const char *prefix);
  extern int cmd_name_rev(int argc, const char **argv, const char *prefix);
diff --combined git.c
index 51ee647295,0c0483f815..517ef414f7
--- a/git.c
+++ b/git.c
@@@ -256,7 -256,7 +256,7 @@@ static int run_command(struct cmd_struc
  
  	status = p->fn(argc, argv, prefix);
  	if (status)
 -		return status;
 +		return status & 0xff;
  
  	/* Somebody closed stdout? */
  	if (fstat(fileno(stdout), &st))
@@@ -293,6 -293,7 +293,7 @@@ static void handle_internal_command(in
  		{ "check-attr", cmd_check_attr, RUN_SETUP | NEED_WORK_TREE },
  		{ "cherry", cmd_cherry, RUN_SETUP },
  		{ "cherry-pick", cmd_cherry_pick, RUN_SETUP | NEED_WORK_TREE },
+ 		{ "clean", cmd_clean, RUN_SETUP | NEED_WORK_TREE },
  		{ "commit-tree", cmd_commit_tree, RUN_SETUP },
  		{ "config", cmd_config },
  		{ "count-objects", cmd_count_objects, RUN_SETUP },
@@@ -325,7 -326,6 +326,7 @@@
  		{ "mailsplit", cmd_mailsplit },
  		{ "merge-base", cmd_merge_base, RUN_SETUP },
  		{ "merge-file", cmd_merge_file },
 +		{ "merge-ours", cmd_merge_ours, RUN_SETUP },
  		{ "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE },
  		{ "name-rev", cmd_name_rev, RUN_SETUP },
  		{ "pack-objects", cmd_pack_objects, RUN_SETUP },