]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'kn/for-all-refs'
authorJunio C Hamano <gitster@pobox.com>
Tue, 5 Mar 2024 17:44:44 +0000 (09:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 5 Mar 2024 17:44:44 +0000 (09:44 -0800)
"git for-each-ref" learned "--include-root-refs" option to show
even the stuff outside the 'refs/' hierarchy.

* kn/for-all-refs:
  for-each-ref: add new option to include root refs
  ref-filter: rename 'FILTER_REFS_ALL' to 'FILTER_REFS_REGULAR'
  refs: introduce `refs_for_each_include_root_refs()`
  refs: extract out `loose_fill_ref_dir_regular_file()`
  refs: introduce `is_pseudoref()` and `is_headref()`

1  2 
Documentation/git-for-each-ref.txt
ref-filter.c
refs.c
refs.h
refs/files-backend.c
refs/refs-internal.h
refs/reftable-backend.c
t/t0600-reffiles-backend.sh

Simple merge
diff --cc ref-filter.c
Simple merge
diff --cc refs.c
Simple merge
diff --cc refs.h
Simple merge
Simple merge
Simple merge
Simple merge
index 09e71b2b0f9fab661e17c10b3bec4689147041ce,e6a5f1868f917d01b791dbed2a5afce2b1965fca..64214340e75f9ecbb20380c4cfe8e6f5813a5495
@@@ -279,31 -279,31 +279,31 @@@ test_expect_success 'setup worktree' 
  # direct FS access for creating the reflogs. 3) PSEUDO-WT and refs/bisect/random
  # do not create reflogs by default, so it is not testing a realistic scenario.
  test_expect_success 'for_each_reflog()' '
--      echo $ZERO_OID > .git/logs/PSEUDO-MAIN &&
++      echo $ZERO_OID >.git/logs/PSEUDO_MAIN_HEAD &&
        mkdir -p     .git/logs/refs/bisect &&
--      echo $ZERO_OID > .git/logs/refs/bisect/random &&
++      echo $ZERO_OID >.git/logs/refs/bisect/random &&
  
--      echo $ZERO_OID > .git/worktrees/wt/logs/PSEUDO-WT &&
++      echo $ZERO_OID >.git/worktrees/wt/logs/PSEUDO_WT_HEAD &&
        mkdir -p     .git/worktrees/wt/logs/refs/bisect &&
--      echo $ZERO_OID > .git/worktrees/wt/logs/refs/bisect/wt-random &&
++      echo $ZERO_OID >.git/worktrees/wt/logs/refs/bisect/wt-random &&
  
 -      $RWT for-each-reflog | cut -d" " -f 2- | sort >actual &&
 +      $RWT for-each-reflog >actual &&
        cat >expected <<-\EOF &&
 -      HEAD 0x1
 -      PSEUDO-WT 0x0
 -      refs/bisect/wt-random 0x0
 -      refs/heads/main 0x0
 -      refs/heads/wt-main 0x0
 +      HEAD
-       PSEUDO-WT
++      PSEUDO_WT_HEAD
 +      refs/bisect/wt-random
 +      refs/heads/main
 +      refs/heads/wt-main
        EOF
        test_cmp expected actual &&
  
 -      $RMAIN for-each-reflog | cut -d" " -f 2- | sort >actual &&
 +      $RMAIN for-each-reflog >actual &&
        cat >expected <<-\EOF &&
 -      HEAD 0x1
 -      PSEUDO-MAIN 0x0
 -      refs/bisect/random 0x0
 -      refs/heads/main 0x0
 -      refs/heads/wt-main 0x0
 +      HEAD
-       PSEUDO-MAIN
++      PSEUDO_MAIN_HEAD
 +      refs/bisect/random
 +      refs/heads/main
 +      refs/heads/wt-main
        EOF
        test_cmp expected actual
  '