From: Junio C Hamano Date: Fri, 9 Nov 2007 08:21:44 +0000 (-0800) Subject: Merge branch 'maint' X-Git-Tag: v1.5.4-rc0~243 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5d4138a66d265e7ddbe21d44f79bcaa1e9a6b6ff;p=git.git Merge branch 'maint' * maint: Start preparing for 1.5.3.6 git-send-email: Change the prompt for the subject of the initial message. SubmittingPatches: improve the 'Patch:' section of the checklist instaweb: Minor cleanups and fixes for potential problems stop t1400 hiding errors in tests Makefile: add missing dependency on wt-status.h refresh_index_quietly(): express "optional" nature of index writing better Fix sed string regex escaping in module_name. Avoid a few unportable, needlessly nested "...`...". git-mailsplit: with maildirs not only process cur/, but also new/ Signed-off-by: Junio C Hamano --- 5d4138a66d265e7ddbe21d44f79bcaa1e9a6b6ff diff --cc Makefile index 0d5590f6c,2331e45ad..621270f62 --- a/Makefile +++ b/Makefile @@@ -920,8 -891,10 +920,9 @@@ git-http-push$X: revision.o http.o http $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) -$(LIB_OBJS) $(BUILTIN_OBJS) fetch.o: $(LIB_H) +$(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H) $(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h) -$(DIFF_OBJS): diffcore.h + builtin-revert.o builtin-runstatus.o wt-status.o: wt-status.h $(LIB_FILE): $(LIB_OBJS) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)