Browse Source

Merge branch 'jn/maint-bundle'

* jn/maint-bundle:
  fix "bundle --stdin" segfault
  t5704 (bundle): add tests for bundle --stdin
maint
Junio C Hamano 15 years ago
parent
commit
dfe0171c4e
  1. 4
      object.c
  2. 16
      t/t5704-bundle.sh

4
object.c

@ -252,10 +252,10 @@ void add_object_array_with_mode(struct object *obj, const char *name, struct obj @@ -252,10 +252,10 @@ void add_object_array_with_mode(struct object *obj, const char *name, struct obj

void object_array_remove_duplicates(struct object_array *array)
{
int ref, src, dst;
unsigned int ref, src, dst;
struct object_array_entry *objects = array->objects;

for (ref = 0; ref < array->nr - 1; ref++) {
for (ref = 0; ref + 1 < array->nr; ref++) {
for (src = ref + 1, dst = src;
src < array->nr;
src++) {

16
t/t5704-bundle.sh

@ -30,4 +30,20 @@ test_expect_success 'tags can be excluded by rev-list options' ' @@ -30,4 +30,20 @@ test_expect_success 'tags can be excluded by rev-list options' '

'

test_expect_failure 'bundle --stdin' '

echo master | git bundle create stdin-bundle.bdl --stdin &&
git ls-remote stdin-bundle.bdl >output &&
grep master output

'

test_expect_failure 'bundle --stdin <rev-list options>' '

echo master | git bundle create hybrid-bundle.bdl --stdin tag &&
git ls-remote hybrid-bundle.bdl >output &&
grep master output

'

test_done

Loading…
Cancel
Save