Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  config: Change output of --get-regexp for valueless keys
  config: Complete documentation of --get-regexp
  cleanup merge-base test script
  Fix zero-object version-2 packs
  Ignore submodule commits when fetching over dumb protocols
  • Loading branch information
Junio C Hamano committed Jun 27, 2007
2 parents b658d50 + b69ba46 commit 68fb465
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 15 deletions.
2 changes: 2 additions & 0 deletions Documentation/git-config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ SYNOPSIS
'git-config' [--system | --global] --replace-all name [value [value_regex]]
'git-config' [--system | --global] [type] --get name [value_regex]
'git-config' [--system | --global] [type] --get-all name [value_regex]
'git-config' [--system | --global] [type] --get-regexp name_regex [value_regex]
'git-config' [--system | --global] --unset name [value_regex]
'git-config' [--system | --global] --unset-all name [value_regex]
'git-config' [--system | --global] --rename-section old_name new_name
Expand Down Expand Up @@ -73,6 +74,7 @@ OPTIONS

--get-regexp::
Like --get-all, but interprets the name as a regular expression.
Also outputs the key names.

--global::
For writing options: write to global ~/.gitconfig file rather than
Expand Down
8 changes: 6 additions & 2 deletions builtin-config.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,12 @@ static int show_config(const char* key_, const char* value_)
regexec(regexp, (value_?value_:""), 0, NULL, 0)))
return 0;

if (show_keys)
printf("%s ", key_);
if (show_keys) {
if (value_)
printf("%s ", key_);
else
printf("%s", key_);
}
if (seen && !do_all)
dup_error = 1;
if (type == T_INT)
Expand Down
3 changes: 3 additions & 0 deletions fetch.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ static int process_tree(struct tree *tree)
while (tree_entry(&desc, &entry)) {
struct object *obj = NULL;

/* submodule commits are not stored in the superproject */
if (S_ISGITLINK(entry.mode))
continue;
if (S_ISDIR(entry.mode)) {
struct tree *tree = lookup_tree(entry.sha1);
if (tree)
Expand Down
5 changes: 4 additions & 1 deletion sha1_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,10 @@ static int check_packed_git_idx(const char *path, struct packed_git *p)
* for offsets larger than 2^31.
*/
unsigned long min_size = 8 + 4*256 + nr*(20 + 4 + 4) + 20 + 20;
if (idx_size < min_size || idx_size > min_size + (nr - 1)*8) {
unsigned long max_size = min_size;
if (nr)
max_size += (nr - 1)*8;
if (idx_size < min_size || idx_size > max_size) {
munmap(idx_map, idx_size);
return error("wrong index file size in %s", path);
}
Expand Down
6 changes: 6 additions & 0 deletions t/t1300-repo-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,12 @@ EOF
test_expect_success 'get variable with no value' \
'git-config --get novalue.variable ^$'

echo novalue.variable > expect

test_expect_success 'get-regexp variable with no value' \
'git-config --get-regexp novalue > output &&
cmp output expect'

git-config > output 2>&1

test_expect_success 'no arguments, but no crash' \
Expand Down
30 changes: 18 additions & 12 deletions t/t6010-merge-base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ doit() {
echo $commit
}

# E---D---C---B---A
# \'-_ \ \
# \ `---------G \
# \ \
# F----------------H

# Setup...
E=$(doit 5 E)
D=$(doit 4 D $E)
Expand All @@ -44,6 +50,18 @@ A=$(doit 1 A $B)
G=$(doit 7 G $B $E)
H=$(doit 8 H $A $F)

test_expect_success 'compute merge-base (single)' \
'MB=$(git-merge-base G H) &&
expr "$(git-name-rev "$MB")" : "[0-9a-f]* tags/B"'

test_expect_success 'compute merge-base (all)' \
'MB=$(git-merge-base --all G H) &&
expr "$(git-name-rev "$MB")" : "[0-9a-f]* tags/B"'

test_expect_success 'compute merge-base with show-branch' \
'MB=$(git-show-branch --merge-base G H) &&
expr "$(git-name-rev "$MB")" : "[0-9a-f]* tags/B"'

# Setup for second test to demonstrate that relying on timestamps in a
# distributed SCM to provide a _consistent_ partial ordering of commits
# leads to insanity.
Expand Down Expand Up @@ -81,18 +99,6 @@ R2=$(doit 3 R2 $R1)
PL=$(doit 4 PL $L2 $C2)
PR=$(doit 4 PR $C2 $R2)

test_expect_success 'compute merge-base (single)' \
'MB=$(git-merge-base G H) &&
expr "$(git-name-rev "$MB")" : "[0-9a-f]* tags/B"'

test_expect_success 'compute merge-base (all)' \
'MB=$(git-merge-base --all G H) &&
expr "$(git-name-rev "$MB")" : "[0-9a-f]* tags/B"'

test_expect_success 'compute merge-base with show-branch' \
'MB=$(git-show-branch --merge-base G H) &&
expr "$(git-name-rev "$MB")" : "[0-9a-f]* tags/B"'

test_expect_success 'compute merge-base (single)' \
'MB=$(git-merge-base PL PR) &&
expr "$(git-name-rev "$MB")" : "[0-9a-f]* tags/C2"'
Expand Down

0 comments on commit 68fb465

Please sign in to comment.