From c69f4050958b648acd668b37dc77772e05148a97 Mon Sep 17 00:00:00 2001 From: "Richard P. Curnow" Date: Wed, 9 May 2007 23:13:44 +0100 Subject: [PATCH 1/4] Fix documentation of tag in git-fast-import.txt The tag command does not take a trailing LF. Signed-off-by: Richard P. Curnow Signed-off-by: Junio C Hamano --- Documentation/git-fast-import.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index eaba6fd4c..8d06775a6 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -548,7 +548,6 @@ lightweight (non-annotated) tags see the `reset` command below. 'from' SP LF 'tagger' SP SP LT GT SP LF data - LF .... where `` is the name of the tag to create. From c2f599e09fd0496413d1744b5b89b9b5c223555d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 9 May 2007 17:11:15 -0700 Subject: [PATCH 2/4] git-clone: don't get fooled by $PWD If you have /home/me/git symlink pointing at /pub/git/mine, trying to clone from /pub/git/his/ using relative path would not work as expected: $ cd /home/me $ cd git $ ls ../ his mine $ git clone -l -s -n ../his/stuff.git This is because "cd ../his/stuff.git" done inside git-clone to check if the repository is local is confused by $PWD, which is set to /home/me, and tries to go to /home/his/stuff.git which is different from /pub/git/his/stuff.git. We could probably say "set -P" (or "cd -P") instead, if we know the shell is POSIX, but the way the patch is coded is probably more portable. [jc: this is updated with Andy Whitcroft's improvements] Signed-off-by: Junio C Hamano --- git-clone.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/git-clone.sh b/git-clone.sh index cad5c0c08..70374aaaf 100755 --- a/git-clone.sh +++ b/git-clone.sh @@ -18,7 +18,14 @@ usage() { } get_repo_base() { - (cd "$1" && (cd .git ; pwd)) 2> /dev/null + ( + cd "`/bin/pwd`" && + cd "$1" && + { + cd .git 2>/dev/null + pwd + } + ) } if [ -n "$GIT_SSL_NO_VERIFY" ]; then From e18ee576b1420e7b2cfc5c686872fa3b439ac45f Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Mon, 30 Apr 2007 21:37:57 +0300 Subject: [PATCH 3/4] SPECIFYING RANGES typo fix: it it => it is Signed-off-by: Jari Aalto Signed-off-by: Junio C Hamano --- Documentation/git-rev-parse.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index a8bf6561e..7757abe62 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -255,7 +255,7 @@ reachable from `r1` from the set of commits reachable from A similar notation "`r1\...r2`" is called symmetric difference of `r1` and `r2` and is defined as "`r1 r2 --not $(git-merge-base --all r1 r2)`". -It it the set of commits that are reachable from either one of +It is the set of commits that are reachable from either one of `r1` or `r2` but not from both. Two other shorthands for naming a set that is formed by a commit From b722b9585518c9d75ec5d8731cb90dc0c9fb918c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 10 May 2007 13:24:21 -0700 Subject: [PATCH 4/4] .mailmap: add some aliases --- .mailmap | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.mailmap b/.mailmap index 17e89af11..4e0615e9b 100644 --- a/.mailmap +++ b/.mailmap @@ -35,7 +35,11 @@ Shawn O. Pearce Theodore Ts'o Tony Luck Uwe Kleine-König +Uwe Kleine-König +Uwe Kleine-König +Uwe Kleine-König Ville Skyttä YOSHIFUJI Hideaki anonymous anonymous +Dana L. How