From d35694aadf06fdf2de37cfac1241bbb62f0f573c Mon Sep 17 00:00:00 2001 From: gatesvp Date: Tue, 28 Jul 2015 03:05:01 -0400 Subject: [PATCH] Fix refs -r -u for #1211 License: MIT Signed-off-by: Gaetan Voyer-Perrault --- core/commands/refs.go | 4 ---- test/sharness/t0080-repo.sh | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/core/commands/refs.go b/core/commands/refs.go index 792d59ae1b79..c42e0c42eaf9 100644 --- a/core/commands/refs.go +++ b/core/commands/refs.go @@ -232,10 +232,6 @@ func (rw *RefWriter) writeRefsRecursive(n *dag.Node) (int, error) { return 0, err } - if rw.skip(nkey) { - return 0, nil - } - var count int for i, ng := range rw.DAG.GetDAG(rw.Ctx, n) { lk := key.Key(n.Links[i].Hash) diff --git a/test/sharness/t0080-repo.sh b/test/sharness/t0080-repo.sh index 012f87f75817..9ec8662b5de6 100755 --- a/test/sharness/t0080-repo.sh +++ b/test/sharness/t0080-repo.sh @@ -163,6 +163,30 @@ test_expect_success "'ipfs pin ls --type=all --quiet' is correct" ' test_sort_cmp allpins_uniq_hashes actual_allpins ' +test_expect_success "'ipfs refs --unique' is correct" ' + mkdir -p uniques && + cd uniques && + echo "content1" > file1 && + echo "content1" > file2 && + ROOT=$(ipfs add -r -q . | tail -n1) && + ipfs refs --unique $ROOT >expected && + ipfs add -q file1 >unique_hash && + test_cmp expected unique_hash +' + +test_expect_success "'ipfs refs --unique --recursive' is correct" ' + mkdir -p a/b/c && + echo "c1" > a/f1 && + echo "c1" > a/b/f1 && + echo "c1" > a/b/c/f1 && + echo "c2" > a/b/c/f2 && + ROOT=$(ipfs add -r -q a | tail -n1) && + ipfs refs --unique --recursive $ROOT >refs_output && + wc -l refs_output | sed "s/^ *//g" >line_count && + echo "4 refs_output" >expected && + test_cmp expected line_count +' + test_kill_ipfs_daemon test_done