Merge branch 'tr/maint-bundle-boundary' into maint

"git bundle" did not record boundary commits correctly when there
are many of them.

By Thomas Rast
* tr/maint-bundle-boundary:
  bundle: keep around names passed to add_pending_object()
  t5510: ensure we stay in the toplevel test dir
  t5510: refactor bundle->pack conversion

diff --combined bundle.c
index 7a760db2fc4ab2a807bead051edbf53182c8326a,6c4695eb9103efe3e825ce20303bd220bc6f8827..d9cfd90534b6b6b0659576d5a71d1fa216bfa6b5
--- 1/bundle.c
--- 2/bundle.c
+++ b/bundle.c
@@@ -273,7 -273,7 +273,7 @@@ int create_bundle(struct bundle_header 
                        if (!get_sha1_hex(buf.buf + 1, sha1)) {
                                struct object *object = parse_object(sha1);
                                object->flags |= UNINTERESTING;
-                               add_pending_object(&revs, object, buf.buf);
+                               add_pending_object(&revs, object, xstrdup(buf.buf));
                        }
                } else if (!get_sha1_hex(buf.buf, sha1)) {
                        struct object *object = parse_object(sha1);
@@@ -304,7 -304,7 +304,7 @@@
                        continue;
                if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
                        continue;
 -              if (!resolve_ref(e->name, sha1, 1, &flag))
 +              if (read_ref_full(e->name, sha1, 1, &flag))
                        flag = 0;
                display_ref = (flag & REF_ISSYMREF) ? e->name : ref;
  

diff --combined t/t5510-fetch.sh
index 79ee91313059bf2e6efc7fe3c15c6fd56e8fc671,9d72b16393e3cbee30d16519ae641e84d7485f39..308c02ea75f3400b4d215e6091f03179a93943ad
--- 1/t/t5510-fetch.sh
--- 2/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@@ -14,6 -14,14 +14,14 @@@ test_bundle_object_count () 
        test "$2" = $(grep '^[0-9a-f]\{40\} ' verify.out | wc -l)
  }
  
+ convert_bundle_to_pack () {
+       while read x && test -n "$x"
+       do
+               :;
+       done
+       cat
+ }
+ 
  test_expect_success setup '
        echo >file original &&
        git add file &&
@@@ -70,8 -78,8 +78,8 @@@ test_expect_success "fetch test for-mer
        master_in_two=`cd ../two && git rev-parse master` &&
        one_in_two=`cd ../two && git rev-parse one` &&
        {
 -              echo "$master_in_two    not-for-merge"
                echo "$one_in_two       "
 +              echo "$master_in_two    not-for-merge"
        } >expected &&
        cut -f -2 .git/FETCH_HEAD >actual &&
        test_cmp expected actual'
@@@ -166,7 -174,7 +174,7 @@@ test_expect_success 'fetch must not res
  
  '
  
 -test_expect_success 'fetch must not resolve short remote name' '
 +test_expect_success 'fetch can now resolve short remote name' '
  
        cd "$D" &&
        git update-ref refs/remotes/six/HEAD HEAD &&
@@@ -175,7 -183,8 +183,7 @@@
        cd six &&
        git init &&
  
 -      test_must_fail git fetch .. six:six
 -
 +      git fetch .. six:six
  '
  
  test_expect_success 'create bundle 1' '
@@@ -206,13 -215,7 +214,7 @@@ test_expect_success 'unbundle 1' 
  
  test_expect_success 'bundle 1 has only 3 files ' '
        cd "$D" &&
-       (
-               while read x && test -n "$x"
-               do
-                       :;
-               done
-               cat
-       ) <bundle1 >bundle.pack &&
+       convert_bundle_to_pack <bundle1 >bundle.pack &&
        git index-pack bundle.pack &&
        test_bundle_object_count bundle.pack 3
  '
@@@ -229,13 -232,7 +231,7 @@@ test_expect_success 'bundle does not pr
        git add file2 &&
        git commit -m add.file2 file2 &&
        git bundle create bundle3 -1 HEAD &&
-       (
-               while read x && test -n "$x"
-               do
-                       :;
-               done
-               cat
-       ) <bundle3 >bundle.pack &&
+       convert_bundle_to_pack <bundle3 >bundle.pack &&
        git index-pack bundle.pack &&
        test_bundle_object_count bundle.pack 3
  '
@@@ -433,14 -430,31 +429,31 @@@ test_expect_success 'fetch --dry-run' 
  '
  
  test_expect_success "should be able to fetch with duplicate refspecs" '
-         mkdir dups &&
-         cd dups &&
-         git init &&
-         git config branch.master.remote three &&
-         git config remote.three.url ../three/.git &&
-         git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
-         git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
-         git fetch three
+       mkdir dups &&
+       (
+               cd dups &&
+               git init &&
+               git config branch.master.remote three &&
+               git config remote.three.url ../three/.git &&
+               git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
+               git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
+               git fetch three
+       )
+ '
+ 
+ test_expect_success 'all boundary commits are excluded' '
+       test_commit base &&
+       test_commit oneside &&
+       git checkout HEAD^ &&
+       test_commit otherside &&
+       git checkout master &&
+       test_tick &&
+       git merge otherside &&
+       ad=$(git log --no-walk --format=%ad HEAD) &&
+       git bundle create twoside-boundary.bdl master --since="$ad" &&
+       convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
+       pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
+       test_bundle_object_count .git/objects/pack/pack-${pack##pack    }.pack 3
  '
  
  test_done