diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-06-30 02:42:47 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-30 00:00:30 -0700 |
| commit | bfc04bb9b847912ee41a21fc23110962851878b2 (patch) | |
| tree | 4f55608848764038be2a8e6e454a66d73448074b | |
| parent | 124d3e4cacdf018ddad3449919f471a624e85433 (diff) | |
| download | git-bfc04bb9b847912ee41a21fc23110962851878b2.tar.gz | |
Correct usages of sed in git-tag for Mac OS X
Both `git-tag -l` and `git tag -v` fail on Mac OS X due to their
non-standard uses of sed. Actually `git tag -v` fails because the
underlying git-tag-verify uses a non-standard sed command.
We now stick to only standard sed, which does make our sed scripts
slightly more complicated, but we can actually list tags with more
than 0 lines of additional context and we can verify signed tags
with gpg. These major Git functions are much more important than
saving two or three lines of a simple sed script.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-tag.sh | 16 | ||||
| -rwxr-xr-x | git-verify-tag.sh | 7 |
2 files changed, 14 insertions, 9 deletions
diff --git a/git-tag.sh b/git-tag.sh index c84043902f..3917cd8298 100755 --- a/git-tag.sh +++ b/git-tag.sh @@ -51,12 +51,16 @@ do [ "$LINES" -le 0 ] && { echo "$TAG"; continue ;} OBJTYPE=$(git cat-file -t "$TAG") case $OBJTYPE in - tag) ANNOTATION=$(git cat-file tag "$TAG" | - sed -e '1,/^$/d' \ - -e '/^-----BEGIN PGP SIGNATURE-----$/Q' ) - printf "%-15s %s\n" "$TAG" "$ANNOTATION" | - sed -e '2,$s/^/ /' \ - -e "${LINES}q" + tag) + ANNOTATION=$(git cat-file tag "$TAG" | + sed -e '1,/^$/d' | + sed -n -e " + /^-----BEGIN PGP SIGNATURE-----\$/q + 2,\$s/^/ / + p + ${LINES}q + ") + printf "%-15s %s\n" "$TAG" "$ANNOTATION" ;; *) echo "$TAG" ;; diff --git a/git-verify-tag.sh b/git-verify-tag.sh index f2d5597dba..68858b694d 100755 --- a/git-verify-tag.sh +++ b/git-verify-tag.sh @@ -37,8 +37,9 @@ esac trap 'rm -f "$GIT_DIR/.tmp-vtag"' 0 git-cat-file tag "$1" >"$GIT_DIR/.tmp-vtag" || exit 1 - -cat "$GIT_DIR/.tmp-vtag" | -sed '/-----BEGIN PGP/Q' | +sed -n -e ' + /^-----BEGIN PGP SIGNATURE-----$/q + p +' <"$GIT_DIR/.tmp-vtag" | gpg --verify "$GIT_DIR/.tmp-vtag" - || exit 1 rm -f "$GIT_DIR/.tmp-vtag" |