1. 05 Nov, 2007 4 commits
  2. 04 Nov, 2007 16 commits
  3. 03 Nov, 2007 6 commits
    • Nicolas Pitre's avatar
      git-fetch: more terse fetch output · 165f3902
      Nicolas Pitre authored
      This makes the fetch output much more terse and prettier on a 80 column
      display, based on a consensus reached on the mailing list.  Here's an
      example output:
      
      Receiving objects: 100% (5439/5439), 1.60 MiB | 636 KiB/s, done.
      Resolving deltas: 100% (4604/4604), done.
      From git://git.kernel.org/pub/scm/git/git
       ! [rejected]        html -> origin/html  (non fast forward)
         136e6316..f45e867b  maint -> origin/maint  (fast forward)
         9850e2e..44dd7e0  man -> origin/man  (fast forward)
         3e4bb087..e3d6d56f  master -> origin/master  (fast forward)
         fa3665c..536f64a  next -> origin/next  (fast forward)
       + 4f6d9d6...768326f pu -> origin/pu  (forced update)
       * [new branch]      todo -> origin/todo
      
      Some portions of this patch have been extracted from earlier proposals
      by Jeff King and Shawn Pearce.
      Signed-off-by: default avatarNicolas Pitre <nico@cam.org>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      165f3902
    • Jakub Narębski's avatar
      gitweb: Use config file for repository description and URLs · 0e121a2c
      Jakub Narębski authored
      Allow to use configuration variable gitweb.description for repository
      description if there is no $GIT_DIR/description file, and multivalued
      configuration variable gitweb.url for URLs of a project (to clone or
      fetch from) if there is no $GIT_DIR/cloneurl file.
      
      While repository description is shown in the projects list page, so it
      is better to use file and not config variable for performance, it is I
      think better to use gitweb.url for URLs (as it is shown only on
      project summary page).
      Signed-off-by: Jakub Narębski's avatarJakub Narebski <jnareb@gmail.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      0e121a2c
    • Jakub Narębski's avatar
      gitweb: Read repo config using 'git config -z -l' · b201927a
      Jakub Narębski authored
      Change git_get_project_config to run git-config only once per
      repository, without changing its signature (its calling convention).
      This means for example that it returns 'true' or 'false' when called
      with second argument '--bool', and not true or false value.
      
      Instead of calling 'git config [<type>] --get gitweb.<key>' once for
      each config variable, call 'git config -z -l' only once, parsing and
      saving its output to %config variable.  This makes possible to add new
      per repository configuration without paying cost of forking once per
      variable checked.  We can now allow repository description and
      repository URLs to be stored in config file without badly affecting
      gitweb performance.
      
      For now only configuration variables for 'gitweb' section are stored.
      
      Multiple values for single configuration variable are stored as
      anonymous array reference; configuration variable with no value is
      stored as undef.
      
      Converting configuration variable values to boolean or integer value
      are done in Perl.  Results differ from git-config in the fact that no
      conversion error is ever raised.  For boolean values no value, 'true'
      (any case) and 'false' (any case) are considered true, numbers are
      true if not zero; all other values (even invalid for bool) are
      considered false.  For integer values value suffix of 'k', 'm', or 'g'
      following decimal number will cause the value to be multiplied by
      1024, 1048576, or 1073741824; other values are returned as-is, only
      whitespace stripped.
      Signed-off-by: Jakub Narębski's avatarJakub Narebski <jnareb@gmail.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      b201927a
    • Jakub Narębski's avatar
      gitweb: Add tests for overriding gitweb config with repo config · e9c34c23
      Jakub Narębski authored
      Make blame view and snapshot support overridable by repository
      config. Test tree view with both features disabled, and with both
      features enabled.
      
      Test with features enabled also tests multiple formats snapshot
      support (in tree view).
      Signed-off-by: Jakub Narębski's avatarJakub Narebski <jnareb@gmail.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      e9c34c23
    • Junio C Hamano's avatar
    • Junio C Hamano's avatar
      cherry-pick/revert -m: add tests · 6232b343
      Junio C Hamano authored
      This adds a new test to check cherry-pick/revert of a merge
      commit.
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      6232b343
  4. 02 Nov, 2007 14 commits