Permalink
Commits on Nov 18, 2011
  1. @gitster

    Git 1.7.7.4

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

    Merge branch 'jc/maint-name-rev-all' into maint

    * jc/maint-name-rev-all:
      name-rev --all: do not even attempt to describe non-commit object
    gitster committed Nov 18, 2011
  3. @gitster

    Merge branch 'ml/mailmap' into maint

    * ml/mailmap:
      mailmap: xcalloc mailmap_info
    
    Conflicts:
    	mailmap.c
    gitster committed Nov 18, 2011
  4. @gitster

    Merge branch 'jn/maint-notes-avoid-va-args' into maint

    * jn/maint-notes-avoid-va-args:
      notes merge: eliminate OUTPUT macro
    
    Conflicts:
    	notes-merge.c
    gitster committed Nov 18, 2011
  5. @jrn @gitster

    Makefile: add missing header file dependencies

    When the streaming filter API was introduced in v1.7.7-rc0~60^2~7
    (2011-05-20), we forgot to add its header to LIB_H.  Most translation
    units depend on streaming.h via cache.h.
    
    v1.7.5-rc0~48 (Fix sparse warnings, 2011-03-22) introduced undeclared
    dependencies by url.o on url.h and thread-utils.o on thread-utils.h.
    
    Noticed by make CHECK_HEADER_DEPENDENCIES=1.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Nov 18, 2011
  6. @jrn @gitster

    notes merge: eliminate OUTPUT macro

    The macro is variadic, which breaks support for pre-C99 compilers,
    and it hides an "if", which can make code hard to understand on
    first reading if some arguments have side-effects.
    
    The OUTPUT macro seems to have been inspired by the "output" function
    from merge-recursive.  But that function in merge-recursive exists to
    indent output based on the level of recursion and there is no similar
    justification for such a function in "notes merge".
    
    Noticed with 'make CC="gcc -std=c89 -pedantic"':
    
     notes-merge.c:24:22: warning: anonymous variadic macros were introduced in C99 [-Wvariadic-macros]
    
    Encouraged-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Johan Herland <johan@herland.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Nov 18, 2011
Commits on Nov 17, 2011
  1. @elmarco @gitster

    mailmap: xcalloc mailmap_info

    This is to avoid reaching free of uninitialized members.
    
    With an invalid .mailmap (and perhaps in other cases), it can reach
    free(mi->name) with garbage for example.
    
    Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    elmarco committed with gitster Nov 17, 2011
Commits on Nov 15, 2011
  1. @gitster

    name-rev --all: do not even attempt to describe non-commit object

    This even dates back to the very beginning of "git name-rev";
    it does not make much sense to dump all objects in the repository
    and label non-commits as "undefined".
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 15, 2011
Commits on Nov 9, 2011
  1. @gitster

    Git 1.7.7.3

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

    Merge branch 'jc/maint-remove-renamed-ref' into maint

    * jc/maint-remove-renamed-ref:
      branch -m/-M: remove undocumented RENAMED-REF
    
    Conflicts:
    	refs.c
    gitster committed Nov 9, 2011
  3. @gitster

    Merge branch 'jm/maint-gitweb-filter-forks-fix' into maint

    * jm/maint-gitweb-filter-forks-fix:
      gitweb: fix regression when filtering out forks
    gitster committed Nov 9, 2011
  4. @gitster

    Merge branch 'dm/pack-objects-update' into maint

    * dm/pack-objects-update:
      pack-objects: don't traverse objects unnecessarily
      pack-objects: rewrite add_descendants_to_write_order() iteratively
      pack-objects: use unsigned int for counter and offset values
      pack-objects: mark add_to_write_order() as inline
    gitster committed Nov 9, 2011
Commits on Nov 8, 2011
  1. @gitster

    docs: Update install-doc-quick

    The preformatted documentation pages live in their own repositories
    these days. Adjust the installation procedure to the updated layout.
    
    Tested-by: Stefan Naewe <stefan.naewe@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 8, 2011
  2. @peff @gitster

    docs: don't mention --quiet or --exit-code in git-log(1)

    These are diff-options, but they don't actually make sense
    in the context of log.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Nov 8, 2011
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