Permalink
Commits on Nov 1, 2011
  1. @gitster

    Git 1.7.7.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 1, 2011
  2. @gitster

    Merge branch 'rs/maint-estimate-cache-size' into maint

    * rs/maint-estimate-cache-size:
      t7511: avoid use of reserved filename on Windows.
    gitster committed Nov 1, 2011
  3. @gitster

    Merge branch 'md/smtp-tls-hello-again' into maint

    * md/smtp-tls-hello-again:
      send-email: Honour SMTP domain when using TLS
    gitster committed Nov 1, 2011
  4. @gitster

    Merge branch 'jk/pull-rebase-with-work-tree' into maint

    * jk/pull-rebase-with-work-tree:
      pull,rebase: handle GIT_WORK_TREE better
    
    Conflicts:
    	git-pull.sh
    gitster committed Nov 1, 2011
  5. @gitster

    Merge branch 'jc/maint-diffstat-numstat-context' into maint

    * jc/maint-diffstat-numstat-context:
      diff: teach --stat/--numstat to honor -U$num
    gitster committed Nov 1, 2011
  6. @gitster

    Merge branch 'js/bisect-no-checkout' into maint

    * js/bisect-no-checkout:
      bisect: fix exiting when checkout failed in bisect_start()
    gitster committed Nov 1, 2011
  7. @gitster

    Merge branch 'bc/attr-ignore-case' into maint

    * bc/attr-ignore-case:
      attr.c: respect core.ignorecase when matching attribute patterns
      attr: read core.attributesfile from git_default_core_config
      builtin/mv.c: plug miniscule memory leak
      cleanup: use internal memory allocation wrapper functions everywhere
      attr.c: avoid inappropriate access to strbuf "buf" member
    
    Conflicts:
    	remote.c
    gitster committed Nov 1, 2011
  8. @gitster

    Merge branch 'cn/fetch-prune' into maint

    * cn/fetch-prune:
      fetch: treat --tags like refs/tags/*:refs/tags/* when pruning
      fetch: honor the user-provided refspecs when pruning refs
      remote: separate out the remote_find_tracking logic into query_refspecs
      t5510: add tests for fetch --prune
      fetch: free all the additional refspecs
    gitster committed Nov 1, 2011
  9. @gitster

    Merge branch 'sp/smart-http-failure' into maint

    * sp/smart-http-failure:
      remote-curl: Fix warning after HTTP failure
    gitster committed Nov 1, 2011
  10. @gitster

    Merge jn/maint-http-error-message

    * commit 'be22d92eac809ad2bfa2b7c83ad7cad5a15f1c43':
      http: avoid empty error messages for some curl errors
      http: remove extra newline in error message
    gitster committed Nov 1, 2011
Commits on Oct 31, 2011
  1. @patthoyts @gitster

    t7511: avoid use of reserved filename on Windows.

    PRN is a special filename on Windows to send data to the printer. As
    this is generated during test 3 substitute an alternate prefix to avoid this.
    
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    patthoyts committed with gitster Oct 31, 2011
Commits on Oct 27, 2011
  1. @gitster

    Merge branch 'rs/maint-estimate-cache-size' into maint

    * rs/maint-estimate-cache-size:
      read-cache.c: fix index memory allocation
    gitster committed Oct 27, 2011
  2. @RichiH @gitster

    clone: Quote user supplied path in a single quote pair

    Without this patch,
    
        $ git clone foo .
    
    results in this:
    
        Cloning into ....
        done.
    
    With it:
    
        Cloning into '.'...
        done.
    
    Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    RichiH committed with gitster Oct 27, 2011
Commits on Oct 26, 2011
  1. @gitster

    Merge branch 'jn/gitweb-highlite-sanitise' into maint

    * jn/gitweb-highlite-sanitise:
      gitweb: Strip non-printable characters from syntax highlighter output
    gitster committed Oct 26, 2011
  2. @gitster

    Merge branch 'jk/argv-array' into maint

    * jk/argv-array:
      run_hook: use argv_array API
      checkout: use argv_array API
      bisect: use argv_array API
      quote: provide sq_dequote_to_argv_array
      refactor argv_array into generic code
      quote.h: fix bogus comment
      add sha1_array API docs
    gitster committed Oct 26, 2011
  3. @gitster

    Merge branch 'jc/run-receive-hook-cleanup' into maint

    * jc/run-receive-hook-cleanup:
      refactor run_receive_hook()
    gitster committed Oct 26, 2011
  4. @gitster

    Merge branch 'cn/eradicate-working-copy' into maint

    * cn/eradicate-working-copy:
      Remove 'working copy' from the documentation and C code
    gitster committed Oct 26, 2011
  5. @gitster

    Merge branch 'maint-1.7.6' into maint

    * maint-1.7.6:
      notes_merge_commit(): do not pass temporary buffer to other function
      gitweb: Fix links to lines in blobs when javascript-actions are enabled
      mergetool: no longer need to save standard input
      mergetool: Use args as pathspec to unmerged files
      t9159-*.sh: skip for mergeinfo test for svn <= 1.4
      date.c: Support iso8601 timezone formats
      remote: only update remote-tracking branch if updating refspec
      remote rename: warn when refspec was not updated
      remote: "rename o foo" should not rename ref "origin/bar"
      remote: write correct fetch spec when renaming remote 'remote'
    gitster committed Oct 26, 2011
  6. @gitster

    Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6

    * mh/maint-notes-merge-pathbuf-fix:
      notes_merge_commit(): do not pass temporary buffer to other function
    gitster committed Oct 26, 2011
  7. @gitster

    Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6

    * ps/gitweb-js-with-lineno:
      gitweb: Fix links to lines in blobs when javascript-actions are enabled
    gitster committed Oct 26, 2011
  8. @gitster

    Merge branch 'jm/mergetool-pathspec' into maint-1.7.6

    * jm/mergetool-pathspec:
      mergetool: no longer need to save standard input
      mergetool: Use args as pathspec to unmerged files
    gitster committed Oct 26, 2011
  9. @gitster

    Merge branch 'mz/remote-rename' into maint-1.7.6

    * mz/remote-rename:
      remote: only update remote-tracking branch if updating refspec
      remote rename: warn when refspec was not updated
      remote: "rename o foo" should not rename ref "origin/bar"
      remote: write correct fetch spec when renaming remote 'remote'
    gitster committed Oct 26, 2011
  10. @gitster

    Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6

    * rj/maint-t9159-svn-rev-notation:
      t9159-*.sh: skip for mergeinfo test for svn <= 1.4
    gitster committed Oct 26, 2011
  11. @gitster

    Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6

    * hl/iso8601-more-zone-formats:
      date.c: Support iso8601 timezone formats
    gitster committed Oct 26, 2011
  12. @gitster

    Merge branch 'maint-1.7.6' into maint

    * maint-1.7.6:
      make the sample pre-commit hook script reject names with newlines, too
      git-read-tree.txt: update sparse checkout examples
      git-read-tree.txt: correct sparse-checkout and skip-worktree description
      git-read-tree.txt: language and typography fixes
      unpack-trees: print "Aborting" to stderr
      Documentation/git-update-index: refer to 'ls-files'
      Documentation: basic configuration of notes.rewriteRef
    gitster committed Oct 26, 2011
  13. @gitster

    Merge branch 'tr/doc-note-rewrite' into maint-1.7.6

    * tr/doc-note-rewrite:
      Documentation: basic configuration of notes.rewriteRef
    gitster committed Oct 26, 2011
  14. @gitster

    Merge branch 'nd/sparse-doc' into maint-1.7.6

    * nd/sparse-doc:
      git-read-tree.txt: update sparse checkout examples
    gitster committed Oct 26, 2011
  15. @gitster

    Merge branch 'mg/maint-doc-sparse-checkout' into maint-1.7.6

    * mg/maint-doc-sparse-checkout:
      git-read-tree.txt: correct sparse-checkout and skip-worktree description
      git-read-tree.txt: language and typography fixes
      unpack-trees: print "Aborting" to stderr
    gitster committed Oct 26, 2011
  16. @gitster

    Merge branch 'maint-1.7.5' into maint-1.7.6

    * maint-1.7.5:
      make the sample pre-commit hook script reject names with newlines, too
      Reindent closing bracket using tab instead of spaces
      Documentation/git-update-index: refer to 'ls-files'
    gitster committed Oct 26, 2011
  17. @gitster

    Merge branch 'maint-1.7.4' into maint-1.7.5

    * maint-1.7.4:
      make the sample pre-commit hook script reject names with newlines, too
      Reindent closing bracket using tab instead of spaces
      Documentation/git-update-index: refer to 'ls-files'
    gitster committed Oct 26, 2011
  18. @gitster

    Merge branch 'maint-1.7.3' into maint-1.7.4

    * maint-1.7.3:
      make the sample pre-commit hook script reject names with newlines, too
      Reindent closing bracket using tab instead of spaces
      Documentation/git-update-index: refer to 'ls-files'
    gitster committed Oct 26, 2011
  19. @gitster

    Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3

    * sn/doc-update-index-assume-unchanged:
      Documentation/git-update-index: refer to 'ls-files'
    gitster committed Oct 26, 2011
  20. @gitster

    read-cache.c: fix index memory allocation

    estimate_cache_size() tries to guess how much memory is needed for the
    in-memory representation of an index file.  It does that by using the
    file size, the number of entries and the difference of the sizes of the
    on-disk and in-memory structs -- without having to check the length of
    the name of each entry, which varies for each entry, but their sums are
    the same no matter the representation.
    
    Except there can be a difference.  First of all, the size is really
    calculated by ce_size and ondisk_ce_size based on offsetof(..., name),
    not sizeof, which can be different.  And entries are padded with 1 to 8
    NULs at the end (after the variable name) to make their total length a
    multiple of eight.
    
    So in order to allocate enough memory to hold the index, change the
    delta calculation to be based on offsetof(..., name) and round up to
    the next multiple of eight.
    
    On a 32-bit Linux, this delta was used before:
    
    	sizeof(struct cache_entry)        == 72
    	sizeof(struct ondisk_cache_entry) == 64
    	                                    ---
    	                                      8
    
    The actual difference for an entry with a filename length of one was,
    however (find the definitions are in cache.h):
    
    	offsetof(struct cache_entry, name)        == 72
    	offsetof(struct ondisk_cache_entry, name) == 62
    
    	ce_size        == (72 + 1 + 8) & ~7 == 80
    	ondisk_ce_size == (62 + 1 + 8) & ~7 == 64
    	                                      ---
    	                                       16
    
    So eight bytes less had been allocated for such entries.  The new
    formula yields the correct delta:
    
    	(72 - 62 + 7) & ~7 == 16
    
    Reported-by: John Hsing <tsyj2007@gmail.com>
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    René Scharfe committed with gitster Oct 24, 2011
  21. @meyering @gitster

    make the sample pre-commit hook script reject names with newlines, too

    The sample pre-commit hook script would fail to reject a file name like
    "a\nb" because of the way newlines are handled in "$(...)".  Adjust the
    test to count filtered bytes and require there be 0.  Also print all
    diagnostics to standard error, not stdout, so they will actually be seen.
    
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    meyering committed with gitster Oct 22, 2011
Commits on Oct 24, 2011
  1. @gitster

    Merge branch 'maint-1.7.3' into maint

    * maint-1.7.3:
      Reindent closing bracket using tab instead of spaces
    gitster committed Oct 24, 2011