From 245f1029d674b95d63b5faea2269f98d28b3adb2 Mon Sep 17 00:00:00 2001 From: Matthias Lederhofer Date: Sun, 7 May 2006 19:32:53 +0200 Subject: core-tutorial.txt: escape asterisk Signed-off-by: Junio C Hamano --- Documentation/core-tutorial.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt index 4211c81972..d1360ecde2 100644 --- a/Documentation/core-tutorial.txt +++ b/Documentation/core-tutorial.txt @@ -971,7 +971,7 @@ $ git show-branch --topo-order master mybranch The first two lines indicate that it is showing the two branches and the first line of the commit log message from their top-of-the-tree commits, you are currently on `master` branch -(notice the asterisk `*` character), and the first column for +(notice the asterisk `\*` character), and the first column for the later output lines is used to show commits contained in the `master` branch, and the second column for the `mybranch` branch. Three commits are shown along with their log messages. -- cgit v1.2.3 From 5d8ee9ceb8912c83336191d32b8898943b8944b8 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sun, 7 May 2006 17:36:12 -0400 Subject: Release config lock if the regex is invalid Signed-off-by: Pavel Roskin Signed-off-by: Junio C Hamano --- config.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config.c b/config.c index 87fb22041e..11d65f8c70 100644 --- a/config.c +++ b/config.c @@ -514,6 +514,8 @@ int git_config_set_multivar(const char* key, const char* value, fprintf(stderr, "Invalid pattern: %s\n", value_regex); free(store.value_regex); + close(fd); + unlink(lock_file); ret = 6; goto out_free; } -- cgit v1.2.3 From 6fe31e2e4cdb7ed5333107174e23fbf2e226e370 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 7 May 2006 15:32:51 -0700 Subject: repo-config: document what value_regexp does a bit more clearly. Signed-off-by: Junio C Hamano --- Documentation/git-repo-config.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Documentation/git-repo-config.txt b/Documentation/git-repo-config.txt index 71f96bdd10..fccecd6770 100644 --- a/Documentation/git-repo-config.txt +++ b/Documentation/git-repo-config.txt @@ -22,10 +22,11 @@ You can query/set/replace/unset options with this command. The name is actually the section and the key separated by a dot, and the value will be escaped. -If you want to set/unset an option which can occur on multiple lines, you -should provide a POSIX regex for the value. If you want to handle the lines -*not* matching the regex, just prepend a single exclamation mark in front -(see EXAMPLES). +If you want to set/unset an option which can occur on multiple +lines, a POSIX regexp `value_regex` needs to be given. Only the +existing values that match the regexp are updated or unset. If +you want to handle the lines that do *not* match the regex, just +prepend a single exclamation mark in front (see EXAMPLES). The type specifier can be either '--int' or '--bool', which will make 'git-repo-config' ensure that the variable(s) are of the given type and -- cgit v1.2.3 From cf9dc65368113caa28f2829e2ada5477fbb031ec Mon Sep 17 00:00:00 2001 From: Martin Waitz Date: Sun, 7 May 2006 20:19:09 +0200 Subject: clone: keep --reference even with -l -s Both -l -s and --reference update objects/info/alternates and used to write over each other. Signed-off-by: Martin Waitz Signed-off-by: Junio C Hamano --- git-clone.sh | 2 +- t/t5700-clone-reference.sh | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100755 t/t5700-clone-reference.sh diff --git a/git-clone.sh b/git-clone.sh index 0805168057..b78524767c 100755 --- a/git-clone.sh +++ b/git-clone.sh @@ -265,7 +265,7 @@ yes,yes) test -f "$repo/objects/info/alternates" && cat "$repo/objects/info/alternates"; echo "$repo/objects" - } >"$GIT_DIR/objects/info/alternates" + } >>"$GIT_DIR/objects/info/alternates" ;; esac git-ls-remote "$repo" >"$GIT_DIR/CLONE_HEAD" diff --git a/t/t5700-clone-reference.sh b/t/t5700-clone-reference.sh new file mode 100755 index 0000000000..916ee15ba1 --- /dev/null +++ b/t/t5700-clone-reference.sh @@ -0,0 +1,78 @@ +#!/bin/sh +# +# Copyright (C) 2006 Martin Waitz +# + +test_description='test clone --reference' +. ./test-lib.sh + +base_dir=`pwd` + +test_expect_success 'preparing first repository' \ +'test_create_repo A && cd A && +echo first > file1 && +git add file1 && +git commit -m initial' + +cd "$base_dir" + +test_expect_success 'preparing second repository' \ +'git clone A B && cd B && +echo second > file2 && +git add file2 && +git commit -m addition && +git repack -a -d && +git prune' + +cd "$base_dir" + +test_expect_success 'cloning with reference' \ +'git clone -l -s --reference B A C' + +cd "$base_dir" + +test_expect_success 'existance of info/alternates' \ +'test `wc -l expected && +git count-objects > current && +diff expected current' + +cd "$base_dir" + +test_expect_success 'updating origin' \ +'cd A && +echo third > file3 && +git add file3 && +git commit -m update && +git repack -a -d && +git prune' + +cd "$base_dir" + +test_expect_success 'pulling changes from origin' \ +'cd C && +git pull origin' + +cd "$base_dir" + +# the 2 local objects are commit and tree from the merge +test_expect_success 'that alternate to origin gets used' \ +'cd C && +echo "2 objects" > expected && +git count-objects | cut -d, -f1 > current && +diff expected current' + +cd "$base_dir" + +test_done -- cgit v1.2.3 From 178613c737f82489a1e2c387236731541fe19081 Mon Sep 17 00:00:00 2001 From: Martin Waitz Date: Sun, 7 May 2006 20:18:53 +0200 Subject: repack: honor -d even when no new pack was created If all objects are reachable via an alternate object store then we still have to remove all obsolete local packs. Signed-off-by: Martin Waitz Signed-off-by: Junio C Hamano --- git-repack.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/git-repack.sh b/git-repack.sh index a5d349fd09..20774fbd7e 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -46,15 +46,15 @@ name=$(git-rev-list --objects --all $rev_list 2>&1 | exit 1 if [ -z "$name" ]; then echo Nothing new to pack. - exit 0 -fi -echo "Pack pack-$name created." +else + echo "Pack pack-$name created." -mkdir -p "$PACKDIR" || exit + mkdir -p "$PACKDIR" || exit -mv .tmp-pack-$name.pack "$PACKDIR/pack-$name.pack" && -mv .tmp-pack-$name.idx "$PACKDIR/pack-$name.idx" || -exit + mv .tmp-pack-$name.pack "$PACKDIR/pack-$name.pack" && + mv .tmp-pack-$name.idx "$PACKDIR/pack-$name.idx" || + exit +fi if test "$remove_redundant" = t then -- cgit v1.2.3