Permalink
Commits on Apr 26, 2012
  1. Git 1.7.9.7

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 26, 2012
  2. Sync with 1.7.8.6

    gitster committed Apr 26, 2012
  3. Git 1.7.8.6

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 26, 2012
  4. Sync with 1.7.7.7

    gitster committed Apr 26, 2012
  5. Git 1.7.7.7

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 26, 2012
  6. bundle: remove stray single-quote from error message

    After running rev-list --boundary to retrieve the list of boundary
    commits, "git bundle create" runs its own revision walk.  If in this
    stage git encounters an unfamiliar option, it writes a message with an
    unbalanced quotation mark:
    
    	error: unrecognized argument: --foo'
    
    Drop the stray quote to match the "unrecognized argument: %s" message
    used elsewhere and save translators some work.
    
    This is mostly a futureproofing measure: for now, the "rev-list
    --boundary" command catches most strange arguments on its own and the
    above message is not seen unless you try something esoteric like "git
    bundle create test.bundle --header HEAD".
    
    Reported-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Apr 26, 2012
Commits on Apr 10, 2012
  1. Merge branch 'maint-1.7.8' into maint-1.7.9

    * maint-1.7.8:
      Documentation/gitweb: trivial English fixes
      fetch/receive: remove over-pessimistic connectivity check
    gitster committed Apr 10, 2012
Commits on Apr 9, 2012
  1. Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8

    * jc/maint-verify-objects-remove-pessimism:
      fetch/receive: remove over-pessimistic connectivity check
    gitster committed Apr 9, 2012
  2. Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8

    * dw/gitweb-doc-grammo:
      Documentation/gitweb: trivial English fixes
    gitster committed Apr 9, 2012
  3. Merge branch 'tr/cache-tree' into maint-1.7.8

    * tr/cache-tree:
      t0090: be prepared that 'wc -l' writes leading blanks
      reset: update cache-tree data when appropriate
      commit: write cache-tree data when writing index anyway
      Refactor cache_tree_update idiom from commit
      Test the current state of the cache-tree optimization
      Add test-scrap-cache-tree
    gitster committed Apr 9, 2012
  4. Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8

    * cb/maint-t5541-make-server-port-portable:
      t5541: check error message against the real port number used
      remote-curl: Fix push status report when all branches fail
    gitster committed Apr 9, 2012
  5. Merge branch 'cn/maint-rev-list-doc' into maint-1.7.8

    * cn/maint-rev-list-doc:
      Documentation: use {asterisk} in rev-list-options.txt when needed
    gitster committed Apr 9, 2012
  6. Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8

    * tr/maint-bundle-boundary:
      bundle: keep around names passed to add_pending_object()
      t5510: ensure we stay in the toplevel test dir
      t5510: refactor bundle->pack conversion
    gitster committed Apr 9, 2012
  7. Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8

    * tr/maint-bundle-long-subject:
      t5704: match tests to modern style
      strbuf: improve strbuf_get*line documentation
      bundle: use a strbuf to scan the log for boundary commits
      bundle: put strbuf_readline_fd in strbuf.c with adjustments
    gitster committed Apr 9, 2012
  8. Merge branch 'ph/rerere-doc' into maint-1.7.8

    * ph/rerere-doc:
      rerere: Document 'rerere remaining'
    gitster committed Apr 9, 2012
Commits on Apr 2, 2012
  1. Git 1.7.9.6

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 2, 2012
  2. Merge branch 'jc/maint-merge-autoedit' into maint

    * jc/maint-merge-autoedit:
      merge: backport GIT_MERGE_AUTOEDIT support
    gitster committed Apr 2, 2012
Commits on Mar 30, 2012
  1. string-list: document that string_list_insert() inserts unique strings

    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    hvoigt committed with gitster Mar 29, 2012
Commits on Mar 26, 2012
  1. Git 1.7.9.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 26, 2012
  2. Merge branch 'jn/maint-fast-import-empty-ls' into maint

    * jn/maint-fast-import-empty-ls:
      fast-import: don't allow 'ls' of path with empty components
      fast-import: leakfix for 'ls' of dirty trees
    gitster committed Mar 26, 2012
  3. Merge branch 'ph/rerere-doc' into maint

    * ph/rerere-doc:
      rerere: Document 'rerere remaining'
    gitster committed Mar 26, 2012
  4. Merge branch 'ms/maint-config-error-at-eol-linecount' into maint

    * ms/maint-config-error-at-eol-linecount:
      config: report errors at the EOL with correct line number
    gitster committed Mar 26, 2012
  5. grep doc: add --break / --heading / -W to synopsis

    All of the other options were included in the synopsis, so it makes
    sense to include these as well.
    
    Signed-off-by: Mark Lodato <lodatom@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    MarkLodato committed with gitster Mar 26, 2012
  6. Documentation: improve description of GIT_EDITOR and preference order

    Previously GIT_EDITOR was not listed in git(1) "Environment Variables" section,
    which could be very confusing to users. Include it in "other" subsection along
    with a link to git-var(1), since that is the page that fully describes all
    places where editor can be set and also their preference order.
    
    Also, git-var(1) did not say that hardcoded fallback 'vi' may have been changed
    at build time. A user could be puzzled if 'nano' pops up even when none of the
    mentioned environment vars or config.editor are set. Clarify this.
    
    Ideally, the build system should be changed to reflect the chosen fallback
    editor when creating the man pages. Not sure if that is even possible though.
    
    Signed-off-by: Rodrigo Silva (MestreLion) <linux@rodrigosilva.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    MestreLion committed with gitster Mar 23, 2012
  7. documentation: fix alphabetic ordered list for git-rebase man page

    An alphabetic ordered list (a.) is converted to numerical in
    the man page (1.) so context comments naming 'a' were confusing,
    fix that by not using ordered list notation for 'a' anb 'b' items.
    
    Signed-off-by: Nelson Benitez Leon <nelsonjesus.benitez@seap.minhap.es>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Nelson Benitez Leon committed with gitster Mar 23, 2012
Commits on Mar 23, 2012
  1. Documentation/gitweb: trivial English fixes

    Change "it's" to "its" where a possessive is intended.  Also add two
    missing "the" that were noticed by Ben Walton.
    
    Signed-off-by: David Waitzman <djw@bbn.com>
    D Waitzman committed with gitster Mar 23, 2012
Commits on Mar 20, 2012
  1. Merge branch 'maint-1.7.8' into maint

    * maint-1.7.8:
      t/Makefile: Use $(sort ...) explicitly where needed
      gitweb: Fix actionless dispatch for non-existent objects
      i18n of multi-line advice messages
    gitster committed Mar 20, 2012
  2. merge: backport GIT_MERGE_AUTOEDIT support

    Even though 1.7.9.x series does not open the editor by default
    when merging in general, it does do so in one occassion: when
    merging an annotated tag. And worse yet, there is no good way
    for older scripts to decline this.
    
    Backport the support for GIT_MERGE_AUTOEDIT environment variable
    from 1.7.10 track to help those stuck on 1.7.9.x maintenance
    track.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 20, 2012
  3. Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8

    * ks/sort-wildcard-in-makefile:
      t/Makefile: Use $(sort ...) explicitly where needed
    gitster committed Mar 20, 2012
  4. Merge branch 'jc/advise-i18n' into maint-1.7.8

    * jc/advise-i18n:
      i18n of multi-line advice messages
    gitster committed Mar 20, 2012
  5. Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8

    * jn/gitweb-unspecified-action:
      gitweb: Fix actionless dispatch for non-existent objects
    gitster committed Mar 20, 2012
Commits on Mar 15, 2012
  1. fetch/receive: remove over-pessimistic connectivity check

    Git 1.7.8 introduced an object and history re-validation step after
    "fetch" or "push" causes new history to be added to a receiving
    repository. This is to protect a malicious server or pushing client from
    corrupting the repository by taking advantage of an existing corrupt
    object that is unconnected to existing history.
    
    But this check is way over-pessimistic.  During "fetch" or "receive-pack"
    (the server side of "push"), unpack-objects and index-pack already
    validate individual objects that are received, and the only thing we would
    want to catch are corrupted objects that already happen to exist in our
    repository but are not referenced from our refs.  Such objects must have
    been written by an earlier run of our codepaths that write out loose
    objects or packfiles, and they must have done the validation of individual
    objects when they did so.  The only thing left to worry about is the
    connectivity integrity, which can be checked with "rev-list --objects",
    which is much cheaper.  We have been paying the 5x to 8x runtime overhead
    the --verify-objects often adds for no real gain.
    
    Revert check_everything_connected() not to use this over-pessimistic
    check.
    
    Credit goes to Nguyễn Thái Ngọc Duy, who originally identified the
    performance regression and endured multiple rounds of reviews to fix it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 15, 2012
Commits on Mar 12, 2012
  1. Git 1.7.9.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 12, 2012
  2. Merge branch 'tr/maint-bundle-boundary' into maint

    "git bundle" did not record boundary commits correctly when there
    are many of them.
    
    By Thomas Rast
    * tr/maint-bundle-boundary:
      bundle: keep around names passed to add_pending_object()
      t5510: ensure we stay in the toplevel test dir
      t5510: refactor bundle->pack conversion
    gitster committed Mar 12, 2012
  3. Merge branch 'jc/maint-diff-patch-header' into maint

    "git diff-index" and its friends at the plumbing level showed the
    "diff --git" header and nothing else for a path whose cached stat
    info is dirty without actual difference when asked to produce a
    patch. This was a longstanding bug that we could have fixed long
    time ago.
    
    By Junio C Hamano
    * jc/maint-diff-patch-header:
      diff -p: squelch "diff --git" header for stat-dirty paths
      t4011: illustrate "diff-index -p" on stat-dirty paths
      t4011: modernise style
    gitster committed Mar 12, 2012