From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jan 2021 22:19:19 +0000 (-0800)
Subject: Merge branch 'jx/bundle'
X-Git-Tag: v2.31.0-rc0~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b48981987956d7cb10c5d7cddbf08d5837bc753;p=thirdparty%2Fgit.git

Merge branch 'jx/bundle'

"git bundle" learns "--stdin" option to read its refs from the
standard input.  Also, it now does not lose refs whey they point
at the same object.

* jx/bundle:
  bundle: arguments can be read from stdin
  bundle: lost objects when removing duplicate pendings
  test: add helper functions for git-bundle
---

8b48981987956d7cb10c5d7cddbf08d5837bc753
diff --cc t/t5510-fetch.sh
index 8da907e770,1e398380eb..42f5503004
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@@ -5,10 -5,8 +5,11 @@@ test_description='Per branch config var
  
  '
  
 +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 +
  . ./test-lib.sh
+ . "$TEST_DIRECTORY"/test-bundle-functions.sh
  
  D=$(pwd)
  
diff --cc t/t5607-clone-bundle.sh
index 5b39f4a288,425258767d..f4c383cd5c
--- a/t/t5607-clone-bundle.sh
+++ b/t/t5607-clone-bundle.sh
@@@ -41,16 -38,16 +41,16 @@@ test_expect_success 'die if bundle fil
  	test_must_fail git bundle create adir --all
  '
  
- test_expect_failure 'bundle --stdin' '
+ test_expect_success 'bundle --stdin' '
 -	echo master | git bundle create stdin-bundle.bdl --stdin &&
 +	echo main | git bundle create stdin-bundle.bdl --stdin &&
  	git ls-remote stdin-bundle.bdl >output &&
 -	grep master output
 +	grep main output
  '
  
- test_expect_failure 'bundle --stdin <rev-list options>' '
+ test_expect_success 'bundle --stdin <rev-list options>' '
 -	echo master | git bundle create hybrid-bundle.bdl --stdin tag &&
 +	echo main | git bundle create hybrid-bundle.bdl --stdin tag &&
  	git ls-remote hybrid-bundle.bdl >output &&
 -	grep master output
 +	grep main output
  '
  
  test_expect_success 'empty bundle file is rejected' '