Merge branch 'jn/maint-bundle'

* jn/maint-bundle:
  fix "bundle --stdin" segfault
  t5704 (bundle): add tests for bundle --stdin
This commit is contained in:
Junio C Hamano 2010-05-21 04:02:22 -07:00
commit dfe0171c4e
2 changed files with 18 additions and 2 deletions

View file

@ -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++) {

View file

@ -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