Permalink
Commits on Mar 7, 2010
  1. Git 1.7.0.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 7, 2010
  2. unset GREP_OPTIONS in test-lib.sh

    I used to set GREP_OPTIONS to exclude *.orig and *.rej files. But with this
    the test t4252-am-options.sh fails because it calls grep with a .rej file:
    
        grep "@@ -1,3 +1,3 @@" file-2.rej
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bertwesarg committed with gitster Nov 18, 2009
  3. stash: suggest the correct command line for unknown options.

    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    moy committed with gitster Mar 5, 2010
  4. t7406: Fix submodule init config tests

    These tests have been broken since they were introduced in commits
    ca2cedb (git-submodule: add support for --rebase., 2009-04-24) and
    42b4917 (git-submodule: add support for --merge., 2009-06-03).
    'git submodule init' expects the submodules to exist in the index.
    In this case, the submodules don't exist and therefore looking for
    the submodules will always fail. To make matters worse, git submodule
    fails visibly to the user by saying:
    
    error: pathspec 'rebasing' did not match any file(s) known to git.
    Did you forget to 'git add'?
    
    but doesn't return an error code. This allows the test to fail silently.
    Fix it by adding the submodules first.
    
    Cc: Johan Herland <johan@herland.net>
    Cc: Peter Hutterer <peter.hutterer@who-t.net>
    Cc: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bebarino committed with gitster Mar 5, 2010
Commits on Mar 5, 2010
  1. Update draft release notes to 1.7.0.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 5, 2010
  2. Merge branch 'jn/gitweb-config-error-die' into maint

    * jn/gitweb-config-error-die:
      gitweb: Die if there are parsing errors in config file
    gitster committed Mar 5, 2010
  3. Merge branch 'jn/maint-fix-pager' into maint

    * jn/maint-fix-pager:
      tests: Fix race condition in t7006-pager
      t7006-pager: if stdout is not a terminal, make a new one
      tests: Add tests for automatic use of pager
      am: Fix launching of pager
      git svn: Fix launching of pager
      git.1: Clarify the behavior of the --paginate option
      Make 'git var GIT_PAGER' always print the configured pager
      Fix 'git var' usage synopsis
    gitster committed Mar 5, 2010
  4. Merge branch 'tr/maint-cherry-pick-list' into maint

    * tr/maint-cherry-pick-list:
      cherry_pick_list: quit early if one side is empty
    gitster committed Mar 5, 2010
  5. Merge branch 'ld/maint-diff-quiet-w' into maint

    * ld/maint-diff-quiet-w:
      git-diff: add a test for git diff --quiet -w
      git diff --quiet -w: check and report the status
    gitster committed Mar 5, 2010
  6. Merge branch 'rs/optim-text-wrap' into maint

    * rs/optim-text-wrap:
      utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
      utf8.c: remove strbuf_write()
      utf8.c: remove print_spaces()
      utf8.c: remove print_wrapped_text()
    gitster committed Mar 5, 2010
  7. Merge branch 'dp/read-not-mmap-small-loose-object' into maint

    * dp/read-not-mmap-small-loose-object:
      hash-object: don't use mmap() for small files
    gitster committed Mar 5, 2010
  8. Merge branch 'np/compress-loose-object-memsave' into maint

    * np/compress-loose-object-memsave:
      sha1_file: be paranoid when creating loose objects
      sha1_file: don't malloc the whole compressed result when writing out objects
    gitster committed Mar 5, 2010
  9. Merge branch 'jc/maint-status-preload' into maint

    * jc/maint-status-preload:
      status: preload index to optimize lstat(2) calls
    gitster committed Mar 5, 2010
  10. Merge branch 'gf/maint-sh-setup-nongit-ok' into maint

    * gf/maint-sh-setup-nongit-ok:
      require_work_tree broken with NONGIT_OK
    gitster committed Mar 5, 2010
  11. Merge branch 'cc/maint-bisect-paths' into maint

    * cc/maint-bisect-paths:
      bisect: error out when passing bad path parameters
    gitster committed Mar 5, 2010
  12. Merge branch 'maint-1.6.6' into maint

    * maint-1.6.6:
      Remove extra '-' from git-am(1)
    gitster committed Mar 5, 2010
  13. Merge branch 'maint-1.6.5' into maint-1.6.6

    * maint-1.6.5:
      Remove extra '-' from git-am(1)
    gitster committed Mar 5, 2010
  14. Remove extra '-' from git-am(1)

    Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    wentasah committed with gitster Mar 4, 2010
Commits on Mar 3, 2010
  1. Start preparing for 1.7.0.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 3, 2010
  2. Merge branch 'tc/maint-transport-ls-remote-with-void' into maint

    * tc/maint-transport-ls-remote-with-void:
      transport: add got_remote_refs flag
    gitster committed Mar 3, 2010
  3. Merge branch 'hm/maint-imap-send-crlf' into maint

    * hm/maint-imap-send-crlf:
      git-imap-send: Convert LF to CRLF before storing patch to draft box
    gitster committed Mar 3, 2010
  4. Merge branch 'sp/maint-push-sideband' into maint

    * sp/maint-push-sideband:
      receive-pack: Send internal errors over side-band #2
      t5401: Use a bare repository for the remote peer
      receive-pack: Send hook output over side band #2
      receive-pack: Wrap status reports inside side-band-64k
      receive-pack: Refactor how capabilities are shown to the client
      send-pack: demultiplex a sideband stream with status data
      run-command: support custom fd-set in async
      run-command: Allow stderr to be a caller supplied pipe
    
    Conflicts:
    	builtin-receive-pack.c
    	run-command.c
    	t/t5401-update-hooks.sh
    gitster committed Mar 3, 2010
  5. Merge branch 'jc/maint-fix-test-perm' into maint

    * jc/maint-fix-test-perm:
      lib-patch-mode.sh: Fix permission
      t6000lib: Fix permission
    gitster committed Mar 3, 2010
  6. Merge branch 'np/fast-import-idx-v2' into maint

    * np/fast-import-idx-v2:
      fast-import: use the diff_delta() max_delta_size argument
      fast-import: honor pack.indexversion and pack.packsizelimit config vars
      fast-import: make default pack size unlimited
      fast-import: use write_idx_file() instead of custom code
      fast-import: use sha1write() for pack data
      fast-import: start using struct pack_idx_entry
    gitster committed Mar 3, 2010
Commits on Mar 2, 2010
  1. gitweb: Fix project-specific feature override behavior

    This commit fixes a bug in processing project-specific override in
    a situation when there is no project, e.g. for the projects list page.
    
    When 'snapshot' feature had project specific config override enabled
    by putting
      $feature{'snapshot'}{'override'} = 1;
    
    (or equivalent) in $GITWEB_CONFIG, and when viewing toplevel gitweb
    page, which means the projects list page (to be more exact this
    happens for any project-less action), gitweb would put the following
    Perl warnings in error log:
    
      gitweb.cgi: Use of uninitialized value $git_dir in concatenation (.) or string at gitweb.cgi line 2065.
      fatal: error processing config file(s)
      gitweb.cgi: Use of uninitialized value $git_dir in concatenation (.) or string at gitweb.cgi line 2221.
      gitweb.cgi: Use of uninitialized value $git_dir in concatenation (.) or string at gitweb.cgi line 2218.
    
    The problem is in the following fragment of code:
    
      # path to the current git repository
      our $git_dir;
      $git_dir = "$projectroot/$project" if $project;
    
      # list of supported snapshot formats
      our @snapshot_fmts = gitweb_get_feature('snapshot');
      @snapshot_fmts = filter_snapshot_fmts(@snapshot_fmts);
    
    For the toplevel gitweb page, which is the list of projects, $project is not
    defined, therefore neither is $git_dir.  gitweb_get_feature() subroutine
    calls git_get_project_config() if project specific override is turned
    on... but we don't have project here.
    
    Those errors mentioned above occur in the following fragment of code in
    git_get_project_config():
    
      	# get config
      	if (!defined $config_file ||
      	    $config_file ne "$git_dir/config") {
      		%config = git_parse_project_config('gitweb');
      		$config_file = "$git_dir/config";
      	}
    
    git_parse_project_config() calls git_cmd() which has '--git-dir='.$git_dir
    
    There are (at least) three possible solutions:
    1. Harden gitweb_get_feature() so that it doesn't call
       git_get_project_config() if $project (and therefore $git_dir) is not
       defined; there is no project for project specific config.
    2. Harden git_get_project_config() like you did in your fix, returning early
       if $git_dir is not defined.
    3. Harden git_cmd() so that it doesn't add "--git-dir=$git_dir" if $git_dir
       is not defined, and change git_get_project_config() so that it doesn't
       even try to access $git_dir if it is not defined.
    
    This commit implements both 1.) and 2.), i.e. gitweb_get_feature() doesn't
    call project-specific override if $git_dir is not defined (if there is no
    project), and git_get_project_config() returns early if $git_dir is not
    defined.
    
    Add a test for this bug to t/t9500-gitweb-standalone-no-errors.sh test.
    
    Reported-by: Eli Barzilay <eli@barzilay.org>
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jnareb committed with gitster Mar 1, 2010
  2. gitweb multiple project roots documentation

    This commit adds in the gitweb/README file a description of how to use gitweb
    with several project roots using apache virtualhost rewrite rules.
    
    Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
    Acked-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    sylr committed with gitster Mar 2, 2010
Commits on Mar 1, 2010
  1. bisect: error out when passing bad path parameters

    As reported by Mark Lodato, "git bisect", when it was started with
    path parameters that match no commit was kind of working without
    taking account of path parameters and was reporting something like:
    
    Bisecting: -1 revisions left to test after this (roughly 0 steps)
    
    It is more correct and safer to just error out in this case, before
    displaying the revisions left, so this patch does just that.
    
    Note that this bug is very old, it exists at least since v1.5.5.
    And it is possible to detect that case earlier in the bisect
    algorithm, but it is not clear that it would be an improvement to
    error out earlier, on the contrary it may change the behavior of
    "git rev-list --bisect-all" for example, which is currently correct.
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    chriscool committed with gitster Feb 28, 2010
Commits on Feb 28, 2010
  1. Git 1.7.0.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 28, 2010
  2. Remove reference to GREP_COLORS from documentation

    There is no longer support for external grep, as per bbc09c2 (grep: rip
    out support for external grep, 2010-01-12), so remove the reference to it
    from the documentation.
    
    Signed-off-by: Mark Lodato <lodatom@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    MarkLodato committed with gitster Feb 27, 2010
  3. sha1_name: fix segfault caused by invalid index access

    The code to see if user input "git show :path" makes sense tried to access
    the index without properly checking the array bound.
    
    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    marcows committed with gitster Feb 28, 2010
Commits on Feb 26, 2010
  1. Merge branch 'maint-1.6.6' into maint

    * maint-1.6.6:
      t3301-notes: insert a shbang line in ./fake_editor.sh
    gitster committed Feb 26, 2010
Commits on Feb 25, 2010
  1. t3301-notes: insert a shbang line in ./fake_editor.sh

    This is required on Windows because git-notes is now a built-in
    rather than a shell script.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    j6t committed with gitster Feb 25, 2010
Commits on Feb 24, 2010
  1. commit: quote the user name in the example

    If the user runs
    
     git config --global user.name Your Name
    
    as suggested, user.name will be set to "Your".  With this patch, the
    suggested command will be
    
     git config --global user.name "Your Name"
    
    which will set user.name to "Your Name" and hopefully help users avoid
    the former mistake.
    
    Signed-off-by: Matt Kraai <kraai@ftbfs.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    kraai committed with gitster Feb 24, 2010
  2. Merge branch 'ml/maint-grep-doc' into maint

    * ml/maint-grep-doc:
      grep documentation: clarify what files match
    gitster committed Feb 24, 2010
Commits on Feb 23, 2010
  1. am: remove rebase-apply directory before gc

    When git am does an automatic gc it doesn't clean up the rebase-apply
    directory until after this has finished.  This means that if the user
    aborts the gc then future am or rebase operations will report that an
    existing operation is in progress, which is undesirable and confusing.
    
    Reported by Mark Brown <broonie@debian.org> through
    http://bugs.debian.org/570966
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Feb 22, 2010