From 41f5d73391e3fe5c4cb2829582b26a85930964d1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 14 Mar 2007 09:48:13 -0700 Subject: git-checkout: fix "eval" used for merge labelling. The symbolic notation of the fork point can contain whitespaces (e.g. "git checkout -m 'HEAD@{9 hours ago}'"). Quote strings properly when using eval to prepare GITHEAD_$new Signed-off-by: Junio C Hamano --- git-checkout.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-checkout.sh b/git-checkout.sh index 14835a4aa..83b2639d6 100755 --- a/git-checkout.sh +++ b/git-checkout.sh @@ -196,7 +196,7 @@ else work=`git write-tree` && git read-tree --reset -u $new || exit - eval GITHEAD_$new=${new_name:-${branch:-$new}} && + eval GITHEAD_$new='${new_name:-${branch:-$new}}' && eval GITHEAD_$work=local && export GITHEAD_$new GITHEAD_$work && git merge-recursive $old -- $new $work -- cgit v1.2.1 From 9debca9aac99bc25c99727767ee50c8e405e9591 Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Wed, 14 Mar 2007 22:08:41 +0100 Subject: Clarify doc for git-config --unset-all. Previous formulation could make it appear as removing all lines matching a regexp (at least, I was looking for such a flag, and confused this flag for what I was looking for). Signed-off-by: Yann Dirson Signed-off-by: Junio C Hamano --- Documentation/git-config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 6624484fe..ccb8b36f9 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -78,7 +78,7 @@ OPTIONS Remove the line matching the key from config file. --unset-all:: - Remove all matching lines from config file. + Remove all lines matching the key from config file. -l, --list:: List all variables set in config file. -- cgit v1.2.1 From 3d4e1932f24346d26f15e98dd6a74798035e7870 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 14 Mar 2007 15:56:49 -0700 Subject: GIT 1.5.0.4 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.0.4.txt | 24 ++++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes-1.5.0.4.txt diff --git a/Documentation/RelNotes-1.5.0.4.txt b/Documentation/RelNotes-1.5.0.4.txt new file mode 100644 index 000000000..b727a8d1e --- /dev/null +++ b/Documentation/RelNotes-1.5.0.4.txt @@ -0,0 +1,24 @@ +GIT v1.5.0.4 Release Notes +========================== + +Fixes since v1.5.0.3 +-------------------- + +* Bugfixes + + - git.el does not add duplicate sign-off lines. + + - git-commit shows the full stat of the resulting commit, not + just about the files in the current directory, when run from + a subdirectory. + + - "git-checkout -m '@{8 hours ago}'" had a funny failure from + eval; fixed. + + - git-gui updates. + +* Documentation updates + +* User manual updates + + diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 05f935972..6188415c5 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.5.0.3.GIT +DEF_VER=v1.5.0.4.GIT LF=' ' diff --git a/RelNotes b/RelNotes index 6a658bf13..4e8ff2eb7 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.5.0.3.txt \ No newline at end of file +Documentation/RelNotes-1.5.0.4.txt \ No newline at end of file -- cgit v1.2.1