Skip to content
  • Junio C Hamano's avatar
    Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object · 25bf9513
    Junio C Hamano authored
    * bw/ls-files-sans-the-index:
      ls-files: factor out tag calculation
      ls-files: factor out debug info into a function
      ls-files: convert show_files to take an index
      ls-files: convert show_ce_entry to take an index
      ls-files: convert prune_cache to take an index
      ls-files: convert ce_excluded to take an index
      ls-files: convert show_ru_info to take an index
      ls-files: convert show_other_files to take an index
      ls-files: convert show_killed_files to take an index
      ls-files: convert write_eolinfo to take an index
      ls-files: convert overlay_tree_on_cache to take an index
      tree: convert read_tree to take an index parameter
      convert: convert renormalize_buffer to take an index
      convert: convert convert_to_git to take an index
      convert: convert convert_to_git_filter_fd to take an index
      convert: convert crlf_to_git to take an index
      convert: convert get_cached_convert_stats_ascii to take an index
    
    * bw/config-h:
      config: don't implicitly use gitdir or commondir
      config: respect commondir
      setup: teach discover_git_directory to respect the commondir
      config: don't include config.h by default
      config: remove git_config_iter
      config: create config.h
      alias: use the early config machinery to expand aliases
      t7006: demonstrate a problem with aliases in subdirectories
      t1308: relax the test verifying that empty alias values are disallowed
      help: use early config when autocorrecting aliases
      config: report correct line number upon error
      discover_git_directory(): avoid setting invalid git_dir
    25bf9513