From 1e2847634e7f171b1625295e3f41c1660ff4a61f Mon Sep 17 00:00:00 2001 From: Jens Lehmann Date: Wed, 1 Sep 2010 23:01:49 +0200 Subject: [PATCH 1/4] t7405: cd inside subshell instead of around Instead of using `cd dir && (...) && cd..` use `(cd dir && ...)` This ensures that the test doesn't get caught in the subdirectory if there is an error in the subshell. Signed-off-by: Jens Lehmann Signed-off-by: Junio C Hamano --- t/t7405-submodule-merge.sh | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh index 6ec559db0f..7e2e258950 100755 --- a/t/t7405-submodule-merge.sh +++ b/t/t7405-submodule-merge.sh @@ -67,7 +67,7 @@ test_expect_success setup ' # b in the main repository. test_expect_success 'setup for merge search' ' mkdir merge-search && - cd merge-search && + (cd merge-search && git init && mkdir sub && (cd sub && @@ -101,8 +101,7 @@ test_expect_success 'setup for merge search' ' git checkout -b sub-d sub-b && git merge sub-c) && git commit -a -m "d" && - git branch test b && - cd .. + git branch test b) ' test_expect_success 'merge with one side as a fast-forward of the other' ' @@ -126,7 +125,7 @@ test_expect_success 'merging should conflict for non fast-forward' ' ' test_expect_success 'merging should fail for ambiguous common parent' ' - cd merge-search && + (cd merge-search && git checkout -b test-ambiguous b && (cd sub && git checkout -b ambiguous sub-b && @@ -136,8 +135,7 @@ test_expect_success 'merging should fail for ambiguous common parent' ' test_must_fail git merge c 2> actual && grep $(cat expect1) actual > /dev/null && grep $(cat expect2) actual > /dev/null && - git reset --hard && - cd .. + git reset --hard) ' # in a situation like this @@ -158,7 +156,7 @@ test_expect_success 'merging should fail for ambiguous common parent' ' # commits (sub-a) does not descend from the submodule merge-base (sub-b). # test_expect_success 'merging should fail for changes that are backwards' ' - cd merge-search && + (cd merge-search && git checkout -b bb a && (cd sub && git checkout sub-b) && @@ -175,16 +173,13 @@ test_expect_success 'merging should fail for changes that are backwards' ' git commit -a -m "f" && git checkout -b test-backward e && - test_must_fail git merge f && - cd .. + test_must_fail git merge f) ' test_expect_success 'merging with a modify/modify conflict between merge bases' ' - git reset --hard HEAD && git checkout -b test2 c && git merge d - ' test_done From 4bf9dd97827bf6f475a52e8f621dad24a3db9b4c Mon Sep 17 00:00:00 2001 From: Jens Lehmann Date: Wed, 1 Sep 2010 23:28:27 +0200 Subject: [PATCH 2/4] t7406 & t7407: add missing && at end of lines Signed-off-by: Jens Lehmann Signed-off-by: Junio C Hamano --- t/t7406-submodule-update.sh | 2 +- t/t7407-submodule-foreach.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 1382a8e58a..bfb4975e94 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -25,7 +25,7 @@ test_expect_success 'setup a submodule tree' ' echo file > file && git add file && test_tick && - git commit -m upstream + git commit -m upstream && git clone . super && git clone super submodule && git clone super rebasing && diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh index db9365b645..905a8baae9 100755 --- a/t/t7407-submodule-foreach.sh +++ b/t/t7407-submodule-foreach.sh @@ -16,7 +16,7 @@ test_expect_success 'setup a submodule tree' ' echo file > file && git add file && test_tick && - git commit -m upstream + git commit -m upstream && git clone . super && git clone super submodule && ( @@ -30,7 +30,7 @@ test_expect_success 'setup a submodule tree' ' submodule.sub2 submodule.foo2 && git config -f .gitmodules --rename-section \ submodule.sub3 submodule.foo3 && - git add .gitmodules + git add .gitmodules && test_tick && git commit -m "submodules" && git submodule init sub1 && From e78d01bf4e29ec92b4aa466ea0a49ae4be388ca9 Mon Sep 17 00:00:00 2001 From: Thiago Farina Date: Mon, 30 Aug 2010 00:30:22 -0300 Subject: [PATCH 3/4] builtin/merge_recursive.c: Add an usage string and make use of it. This improves the usage output by adding builtin_merge_recursive_usage string that follows the same pattern used by the other builtin commands. The previous output for git merger-recursive was: usage: merge-recursive ... -- ... Now the output is: usage: git merge-recursive ... -- ... Since cmd_merge_recursive is used to handle four different commands we need the %s in the usage string, so the following example: $ git merge-subtree -h Will output: usage: git merge-subtree ... -- ... Signed-off-by: Thiago Farina Signed-off-by: Junio C Hamano --- builtin/merge-recursive.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index d8875d5892..3d00adbfc7 100644 --- a/builtin/merge-recursive.c +++ b/builtin/merge-recursive.c @@ -3,6 +3,9 @@ #include "tag.h" #include "merge-recursive.h" +static const char builtin_merge_recursive_usage[] = + "git %s ... -- ..."; + static const char *better_branch_name(const char *branch) { static char githead_env[8 + 40 + 1]; @@ -29,7 +32,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix) o.subtree_shift = ""; if (argc < 4) - usagef("%s ... -- ...", argv[0]); + usagef(builtin_merge_recursive_usage, argv[0]); for (i = 1; i < argc; ++i) { const char *arg = argv[i]; From dd34b6be8a3e869f3e0d62a13115f02d90cf4f80 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 3 Sep 2010 09:38:53 -0700 Subject: [PATCH 4/4] Git 1.7.2.3 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.2.3.txt | 7 ------- Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Documentation/RelNotes-1.7.2.3.txt b/Documentation/RelNotes-1.7.2.3.txt index ef8059e6a8..610960cfe1 100644 --- a/Documentation/RelNotes-1.7.2.3.txt +++ b/Documentation/RelNotes-1.7.2.3.txt @@ -37,10 +37,3 @@ Fixes since v1.7.2.2 * "git pack-refs --all --prune" did not remove a directory that has become empty. - ---- -exec >/var/tmp/1 -echo O=$(git describe maint) -O=v1.7.2.2 -git shortlog --no-merges $O..maint -exit 0 diff --git a/Documentation/git.txt b/Documentation/git.txt index 531789321c..93e3b07c6c 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.2.2/git.html[documentation for release 1.7.2.2] +* link:v1.7.2.3/git.html[documentation for release 1.7.2.3] * release notes for + link:RelNotes-1.7.2.3.txt[1.7.2.3], link:RelNotes-1.7.2.2.txt[1.7.2.2], link:RelNotes-1.7.2.1.txt[1.7.2.1], link:RelNotes-1.7.2.txt[1.7.2]. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 2c4f44bfb6..8efc557847 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.2.2 +DEF_VER=v1.7.2.3 LF=' '