From: Junio C Hamano Date: Mon, 10 Oct 2005 02:16:33 +0000 (-0700) Subject: Merge branch 'fixes' X-Git-Tag: v0.99.9~170 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d5b0c9ea178dab3599674ccff50645c0464b8c31;p=git.git Merge branch 'fixes' with minor hand resolving on git-tag. Signed-off-by: Junio C Hamano --- d5b0c9ea178dab3599674ccff50645c0464b8c31 diff --cc Documentation/git-tag.txt index 1eafeef47,e11f51c26..3984812ce --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@@ -7,10 -6,9 +6,9 @@@ NAM git-tag - Create a tag object signed with GPG - SYNOPSIS -------- - 'git-tag' [-a | -s | -u ] [-f] [-m ] -'git-tag' [-a | -s] [-f] [-m ] [] ++'git-tag' [-a | -s | -u ] [-f] [-m ] [] DESCRIPTION ----------- diff --cc Makefile index a20118739,b8ca504f0..ac384c7dc --- a/Makefile +++ b/Makefile @@@ -265,16 -246,9 +265,16 @@@ ifdef NEEDS_NS SIMPLE_LIB += -lnsl endif ifdef NO_STRCASESTR - DEFINES += -Dstrcasestr=gitstrcasestr + DEFINES += -Dstrcasestr=gitstrcasestr -DNO_STRCASESTR=1 LIB_OBJS += compat/strcasestr.o endif +ifdef NO_MMAP + DEFINES += -Dmmap=gitfakemmap -Dmunmap=gitfakemunmap -DNO_MMAP + LIB_OBJS += compat/mmap.o +endif +ifdef NO_IPV6 + DEFINES += -DNO_IPV6 -Dsockaddr_storage=sockaddr_in +endif ifdef PPC_SHA1 SHA1_HEADER = "ppc/sha1.h" diff --cc git-tag.sh index 9afdf5cce,400bdb984..25c1a0e88 --- a/git-tag.sh +++ b/git-tag.sh @@@ -4,7 -4,7 +4,7 @@@ . git-sh-setup || die "Not a git archive" usage () { - echo >&2 "Usage: git-tag [-a | -s | -u ] [-f] [-m ] " - echo >&2 "Usage: git-tag [-a | -s] [-f] [-m "tag message"] tagname [head]" ++ echo >&2 "Usage: git-tag [-a | -s | -u ] [-f] [-m ] []" exit 1 }