Merge branch 'fixes'
This commit is contained in:
commit
2af60a0521
@ -1,16 +1,14 @@
|
|||||||
git-tag(1)
|
git-tag(1)
|
||||||
==========
|
==========
|
||||||
v0.99.4, Aug 2005
|
|
||||||
|
|
||||||
NAME
|
NAME
|
||||||
----
|
----
|
||||||
git-tag - Create a tag object signed with GPG
|
git-tag - Create a tag object signed with GPG
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
'git-tag' [-s | -a] [-f] <name>
|
'git-tag' [-a | -s] [-f] [-m <msg>] <name> [<head>]
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
|
2
Makefile
2
Makefile
@ -246,7 +246,7 @@ ifdef NEEDS_NSL
|
|||||||
SIMPLE_LIB += -lnsl
|
SIMPLE_LIB += -lnsl
|
||||||
endif
|
endif
|
||||||
ifdef NO_STRCASESTR
|
ifdef NO_STRCASESTR
|
||||||
DEFINES += -Dstrcasestr=gitstrcasestr
|
DEFINES += -Dstrcasestr=gitstrcasestr -DNO_STRCASESTR=1
|
||||||
LIB_OBJS += compat/strcasestr.o
|
LIB_OBJS += compat/strcasestr.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
. git-sh-setup || die "Not a git archive"
|
. git-sh-setup || die "Not a git archive"
|
||||||
|
|
||||||
usage () {
|
usage () {
|
||||||
echo >&2 "Usage: git-tag [-a | -s] [-f] [-m "tag message"] tagname"
|
echo >&2 "Usage: git-tag [-a | -s] [-f] [-m "tag message"] tagname [head]"
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,8 +1,12 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
. git-sh-setup || die "Not a git archive"
|
. 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
|
cat .tmp-vtag | sed '/-----BEGIN PGP/Q' | gpg --verify .tmp-vtag - || exit 1
|
||||||
rm -f .tmp-vtag
|
rm -f .tmp-vtag
|
||||||
|
@ -9,6 +9,10 @@
|
|||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <iconv.h>
|
#include <iconv.h>
|
||||||
|
|
||||||
|
#ifdef NO_STRCASESTR
|
||||||
|
extern char *gitstrcasestr(const char *haystack, const char *needle);
|
||||||
|
#endif
|
||||||
|
|
||||||
static FILE *cmitmsg, *patchfile;
|
static FILE *cmitmsg, *patchfile;
|
||||||
|
|
||||||
static int keep_subject = 0;
|
static int keep_subject = 0;
|
||||||
|
@ -55,6 +55,10 @@ static void generate_id_list(void)
|
|||||||
if (!patchlen && memcmp(line, "diff ", 5))
|
if (!patchlen && memcmp(line, "diff ", 5))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
/* Ignore git-diff index header */
|
||||||
|
if (!memcmp(line, "index ", 6))
|
||||||
|
continue;
|
||||||
|
|
||||||
/* Ignore line numbers when computing the SHA1 of the patch */
|
/* Ignore line numbers when computing the SHA1 of the patch */
|
||||||
if (!memcmp(line, "@@ -", 4))
|
if (!memcmp(line, "@@ -", 4))
|
||||||
continue;
|
continue;
|
||||||
|
@ -6,13 +6,15 @@ prefix ?= $(HOME)
|
|||||||
template_dir ?= $(prefix)/share/git-core/templates/
|
template_dir ?= $(prefix)/share/git-core/templates/
|
||||||
# DESTDIR=
|
# DESTDIR=
|
||||||
|
|
||||||
all: boilerplates custom
|
all: boilerplates.made custom
|
||||||
find blt
|
find blt
|
||||||
|
|
||||||
# Put templates that can be copied straight from the source
|
# Put templates that can be copied straight from the source
|
||||||
# in a file direc--tory--file in the source. They will be
|
# in a file direc--tory--file in the source. They will be
|
||||||
# just copied to the destination.
|
# just copied to the destination.
|
||||||
boilerplates:
|
|
||||||
|
bpsrc = $(filter-out %~,$(wildcard *--*))
|
||||||
|
boilerplates.made : $(bpsrc)
|
||||||
ls *--* 2>/dev/null | \
|
ls *--* 2>/dev/null | \
|
||||||
while read boilerplate; \
|
while read boilerplate; \
|
||||||
do \
|
do \
|
||||||
@ -25,6 +27,7 @@ boilerplates:
|
|||||||
*) cp $$boilerplate blt/$$dst ;; \
|
*) cp $$boilerplate blt/$$dst ;; \
|
||||||
esac || exit; \
|
esac || exit; \
|
||||||
done || exit
|
done || exit
|
||||||
|
date >$@
|
||||||
|
|
||||||
# If you need build-tailored templates, build them into blt/
|
# If you need build-tailored templates, build them into blt/
|
||||||
# directory yourself here.
|
# directory yourself here.
|
||||||
@ -32,7 +35,7 @@ custom:
|
|||||||
: no custom templates yet
|
: no custom templates yet
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf blt
|
rm -rf blt boilerplates.made
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
$(INSTALL) -d -m755 $(DESTDIR)$(template_dir)
|
$(INSTALL) -d -m755 $(DESTDIR)$(template_dir)
|
||||||
|
Loading…
Reference in New Issue
Block a user