undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fixes'

Browse Source 
with minor hand resolving on git-tag.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-10-09 19:16:33 -07:00
commit d5b0c9ea17
7 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-tag.txt
View File

@ -1,16 +1,14 @@
git-tag(1)
==========
v0.99.4, Aug 2005
NAME
----
git-tag - Create a tag object signed with GPG
SYNOPSIS
--------
'git-tag' [-a | -s | -u <key-id>] [-f] [-m <msg>] <name>
'git-tag' [-a | -s | -u <key-id>] [-f] [-m <msg>] <name> [<head>]
DESCRIPTION
-----------

2
Makefile
View File

@ -265,7 +265,7 @@ ifdef NEEDS_NSL
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

2
git-tag.sh
View File

@ -4,7 +4,7 @@
. git-sh-setup || die "Not a git archive"
usage () {
echo >&2 "Usage: git-tag [-a | -s | -u <key-id>] [-f] [-m <msg>] <tagname>"
echo >&2 "Usage: git-tag [-a | -s | -u <key-id>] [-f] [-m <msg>] <tagname> [<head>]"
exit 1
}

8
git-verify-tag.sh
View File

@ -1,8 +1,12 @@
#!/bin/sh
. git-sh-setup || die "Not a git archive"
tag=$(git-rev-parse $1) || exit 1
type="$(git-cat-file -t "$1" 2>/dev/null)" ||
die "$1: no such object."
git-cat-file tag $tag > .tmp-vtag || exit 1
test "$type" = tag ||
die "$1: cannot verify a non-tag object of type $type."
git-cat-file tag "$1" > .tmp-vtag || exit 1
cat .tmp-vtag | sed '/-----BEGIN PGP/Q' | gpg --verify .tmp-vtag - || exit 1
rm -f .tmp-vtag

4
mailinfo.c
View File

@ -9,6 +9,10 @@
#include <ctype.h>
#include <iconv.h>
#ifdef NO_STRCASESTR
extern char *gitstrcasestr(const char *haystack, const char *needle);
#endif
static FILE *cmitmsg, *patchfile;
static int keep_subject = 0;

4
patch-id.c
View File

@ -55,6 +55,10 @@ static void generate_id_list(void)
if (!patchlen && memcmp(line, "diff ", 5))
continue;
/* Ignore git-diff index header */
if (!memcmp(line, "index ", 6))
continue;
/* Ignore line numbers when computing the SHA1 of the patch */
if (!memcmp(line, "@@ -", 4))
continue;

9
templates/Makefile
View File

@ -6,13 +6,15 @@ prefix ?= $(HOME)
template_dir ?= $(prefix)/share/git-core/templates/
# DESTDIR=
all: boilerplates custom
all: boilerplates.made custom
find blt
# Put templates that can be copied straight from the source
# in a file direc--tory--file in the source. They will be
# just copied to the destination.
boilerplates:
bpsrc = $(filter-out %~,$(wildcard *--*))
boilerplates.made : $(bpsrc)
ls *--* 2>/dev/null | \
while read boilerplate; \
do \
@ -25,6 +27,7 @@ boilerplates:
*) cp $$boilerplate blt/$$dst ;; \
esac || exit; \
done || exit
date >$@
# If you need build-tailored templates, build them into blt/
# directory yourself here.
@ -32,7 +35,7 @@ custom:
: no custom templates yet
clean:
rm -rf blt
rm -rf blt boilerplates.made
install: all
$(INSTALL) -d -m755 $(DESTDIR)$(template_dir)