Permalink
Commits on Oct 8, 2012
  1. Git 1.8.0-rc1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 8, 2012
  2. Merge branch 'jc/maint-t1450-fsck-order-fix'

    The fsck test assumed too much on what kind of error it will
    detect. The only important thing is the inconsistency is detected
    as an error.
    
    * jc/maint-t1450-fsck-order-fix:
      t1450: the order the objects are checked is undefined
    gitster committed Oct 8, 2012
  3. Merge branch 'jc/merge-bases-paint-fix'

    "git fmt-merge-msg" (an internal helper reduce_heads() it uses) had
    a severe performance regression; an empty "git pull" took forever to
    finish as the result.
    
    * jc/merge-bases-paint-fix:
      paint_down_to_common(): parse commit before relying on its timestamp
    gitster committed Oct 8, 2012
  4. Sync with 1.7.12.3

    gitster committed Oct 8, 2012
  5. Git 1.7.12.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 8, 2012
  6. Merge branch 'os/commit-submodule-ignore' into maint

    "git status" honored the ignore=dirty settings in .gitmodules but
    "git commit" didn't.
    
    * os/commit-submodule-ignore:
      commit: pay attention to submodule.$name.ignore in .gitmodules
    gitster committed Oct 8, 2012
  7. Merge branch 'jk/receive-pack-unpack-error-to-pusher' into maint

    "git receive-pack" (the counterpart to "git push") did not give
    progress output while processing objects it received to the puser
    when run over the smart-http protocol.
    
    * jk/receive-pack-unpack-error-to-pusher:
      receive-pack: drop "n/a" on unpacker errors
      receive-pack: send pack-processing stderr over sideband
      receive-pack: redirect unpack-objects stdout to /dev/null
    gitster committed Oct 8, 2012
  8. Merge branch 'rt/maint-clone-single' into maint

    A repository created with "git clone --single" had its fetch
    refspecs set up just like a clone without "--single", leading the
    subsequent "git fetch" to slurp all the other branches, defeating
    the whole point of specifying "only this branch".
    
    * rt/maint-clone-single:
      clone --single: limit the fetch refspec to fetched branch
    gitster committed Oct 8, 2012
  9. Merge branch 'jc/blame-follows-renames' into maint

    It was unclear in the documentation for "git blame" that it is
    unnecessary for users to use the "--follow" option.
    
    * jc/blame-follows-renames:
      git blame: document that it always follows origin across whole-file renames
    gitster committed Oct 8, 2012
  10. Merge branch 'lt/mailinfo-handle-attachment-more-sanely' into maint

    A patch attached as application/octet-stream (e.g. not text/*) were
    mishandled, not correctly honoring Content-Transfer-Encoding
    (e.g. base64).
    
    * lt/mailinfo-handle-attachment-more-sanely:
      mailinfo: don't require "text" mime type for attachments
    gitster committed Oct 8, 2012
Commits on Oct 5, 2012
  1. git-svn: keep leading slash when canonicalizing paths (fallback case)

    Subversion's svn_dirent_canonicalize() and svn_path_canonicalize()
    APIs keep a leading slash in the return value if one was present on
    the argument, which can be useful since it allows relative and
    absolute paths to be distinguished.
    
    When git-svn's canonicalize_path() learned to use these functions if
    available, its semantics changed in the corresponding way.  Some new
    callers rely on the leading slash --- for example, if the slash is
    stripped out then _canonicalize_url_ourselves() will transform
    "proto://host/path/to/resource" to "proto://hostpath/to/resource".
    
    Unfortunately the fallback _canonicalize_path_ourselves(), used when
    the appropriate SVN APIs are not usable, still follows the old
    semantics, so if that code path is exercised then it breaks.  Fix it
    to follow the new convention.
    
    Noticed by forcing the fallback on and running tests.  Without this
    patch, t9101.4 fails:
    
     Bad URL passed to RA layer: Unable to open an ra_local session to \
     URL: Local URL 'file://homejrnsrcgit-scratch/t/trash%20directory.\
     t9101-git-svn-props/svnrepo' contains unsupported hostname at \
     /home/jrn/src/git-scratch/perl/blib/lib/Git/SVN.pm line 148
    
    With it, the git-svn tests pass again.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    jrn committed with Eric Wong Oct 5, 2012
  2. Git::SVN: rename private path field

    All users of $gs->{path} should have been converted to use the
    accessor by now.  Check our work by renaming the underlying variable
    to break callers that try to use it directly.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    jrn committed with Eric Wong Sep 17, 2012
  3. git-svn: use path accessor for Git::SVN objects

    The accessors should improve maintainability and enforce
    consistent access to Git::SVN objects.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
    Eric Wong committed Sep 18, 2012
  4. Make git-svn branch patterns match complete URL

    When using the {word,[...]} style of configuration for tags and branches,
    it appears the intent is to only match whole path parts, since the words
    in the {} pattern are meta-character quoted.
    
    When the pattern word appears in the beginning or middle of the url,
    it's matched completely, since the left side, pattern, and (non-empty)
    right side are joined together with path separators.
    
    However, when the pattern word appears at the end of the URL, the
    right side is an empty pattern, and the resulting regex matches
    more than just the specified pattern.
    
    For example, if you specify something along the lines of
    
        branches = branches/project/{release_1,release_2}
    
    and your repository also contains "branches/project/release_1_2", you
    will also get the release_1_2 branch.  By restricting the match regex
    with anchors, this is avoided.
    
    Signed-off-by: Ammon Riley <ammon.riley@gmail.com>
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    ammonriley committed with Eric Wong Aug 30, 2012
  5. t9164: Add missing quotes in test

    This fixes `ambiguous redirect' error given by bash.
    
    [ew: fix misspelled test name,
         also eliminate space after ">>" to conform to guidelines]
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Robert Luberda committed with Eric Wong Aug 19, 2012
  6. git-svn.perl: keep processing all commits in parents_exclude

    This fixes a bug where git finds the incorrect merge parent.  Consider a
    repository with trunk, branch1 of trunk, and branch2 of branch1.
    Without this change, git interprets a merge of branch2 into trunk as a
    merge of branch1 into trunk.
    
    Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
    Reviewed-by: Sam Vilain <sam@vilain.net>
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    srwalter committed with Eric Wong Aug 20, 2012
  7. git-svn.perl: consider all ranges for a given merge, instead of only …

    …tip-by-tip
    
    Consider the case where you have trunk, branch1 of trunk, and branch2 of
    branch1.  trunk is merged back into branch2, and then branch2 is
    reintegrated into trunk.  The merge of branch2 into trunk will have
    svn:mergeinfo property references to both branch1 and branch2.  When
    git-svn fetches the commit that merges branch2 (check_cherry_pick),
    it is necessary to eliminate the merged contents of branch1 as well as
    branch2, or else the merge will be incorrectly ignored as a cherry-pick.
    
    Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
    Reviewed-by: Sam Vilain <sam@vilain.net>
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    srwalter committed with Eric Wong Aug 20, 2012
Commits on Oct 4, 2012
  1. paint_down_to_common(): parse commit before relying on its timestamp

    When refactoring the merge-base computation to reduce the pairwise
    O(n*(n-1)) traversals to parallel O(n) traversals, the code forgot
    that timestamp based heuristics needs each commit to have been
    parsed.  This caused an empty "git pull" to spend cycles, traversing
    the history all the way down to 0 (because an unparsed commit object
    has 0 timestamp, and any other commit object with positive timestamp
    will be processed for its parents, all getting parsed), only to come
    up with a merge message to be used.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 4, 2012
Commits on Oct 3, 2012
  1. Update draft release notes to 1.8.0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 3, 2012
  2. Merge branch 'nd/grep-reflog'

    Teach the commands from the "log" family the "--grep-reflog" option
    to limit output by string that appears in the reflog entry when the
    "--walk-reflogs" option is in effect.
    
    * nd/grep-reflog:
      revision: make --grep search in notes too if shown
      log --grep-reflog: reject the option without -g
      revision: add --grep-reflog to filter commits by reflog messages
      grep: prepare for new header field filter
    gitster committed Oct 3, 2012
  3. Merge branch 'lt/mailinfo-handle-attachment-more-sanely'

    A patch attached as application/octet-stream (e.g. not text/*) were
    mishandled, not correctly honoring Content-Transfer-Encoding
    (e.g. base64).
    
    * lt/mailinfo-handle-attachment-more-sanely:
      mailinfo: don't require "text" mime type for attachments
    gitster committed Oct 3, 2012
  4. Merge branch 'tu/gc-auto-quiet'

    "gc --auto" notified the user that auto-packing has triggered even
    under the "--quiet" option.
    
    * tu/gc-auto-quiet:
      silence git gc --auto --quiet output
    gitster committed Oct 3, 2012
Commits on Oct 2, 2012
  1. t1450: the order the objects are checked is undefined

    When a tag T points at an object X that is of a type that is
    different from what the tag records as, fsck should report it as an
    error.
    
    However, depending on the order X and T are checked individually,
    the actual error message can be different.  If X is checked first,
    fsck remembers X's type and then when it checks T, it notices that T
    records X as a wrong type (i.e. the complaint is about a broken tag
    T).  If T is checked first, on the other hand, fsck remembers that we
    need to verify X is of the type tag records, and when it later
    checks X, it notices that X is of a wrong type (i.e. the complaint
    is about a broken object X).
    
    The important thing is that fsck notices such an error and diagnoses
    the issue on object X, but the test was expecting that we happen to
    check objects in the order to make us detect issues with tag T, not
    with object X.  Remove this unwarranted assumption.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 2, 2012
  2. Merge branch 'maint'

    gitster committed Oct 2, 2012
  3. Start preparing for 1.7.12.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 2, 2012
  4. Merge branch 'rr/maint-submodule-unknown-cmd' into maint

    "git submodule frotz" was not diagnosed as "frotz" being an unknown
    subcommand to "git submodule"; the user instead got a complaint that
    "git submodule status" was run with an unknown path "frotz".
    
    * rr/maint-submodule-unknown-cmd:
      submodule: if $command was not matched, don't parse other args
    gitster committed Oct 2, 2012
  5. Merge branch 'sp/maint-http-enable-gzip' into maint

    "git fetch" over http advertised that it supports "deflate", which
    is much less common, and did not advertise more common "gzip" on its
    Accept-Encoding header.
    
    * sp/maint-http-enable-gzip:
      Enable info/refs gzip decompression in HTTP client
    gitster committed Oct 2, 2012
  6. Merge branch 'sp/maint-http-info-refs-no-retry' into maint

    "git fetch" over http had an old workaround for an unlikely server
    misconfiguration; it turns out that this hurts debuggability of the
    configuration in general, and has been reverted.
    
    * sp/maint-http-info-refs-no-retry:
      Revert "retry request without query when info/refs?query fails"
    gitster committed Oct 2, 2012
  7. l10n: Fix to Swedish translation

    Fix bad translation of "Receiving objects".
    
    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    nafmo committed with gitster Oct 2, 2012
  8. Documentation: mention `push.default` in git-push.txt

    It already is listed in the "git config" documentation, but people
    interested in pushing would first look at "git push" documentation.
    
    Noticed-by: David Glasser
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Acked-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
    Fixed-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Oct 2, 2012
  9. RelNotes/1.8.0: various typo and style fixes

    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Oct 2, 2012
Commits on Oct 1, 2012
  1. Git 1.8.0-rc0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 1, 2012
  2. Merge branch 'jk/completion-tests'

    * jk/completion-tests:
      t9902: add completion tests for "odd" filenames
      t9902: add a few basic completion tests
    gitster committed Oct 1, 2012
  3. Merge branch 'ep/malloc-check-perturb'

    Fixes a brown-paper bag bug.
    
    * ep/malloc-check-perturb:
      MALLOC_CHECK: enable it, unless disabled explicitly
    gitster committed Oct 1, 2012
  4. Merge branch 'da/mergetool-custom'

    The actual external command to run for mergetool backend can be
    specified with difftool/mergetool.$name.cmd configuration
    variables, but this mechanism was ignored for the backends we
    natively support.
    
    * da/mergetool-custom:
      mergetool--lib: Allow custom commands to override built-ins
    gitster committed Oct 1, 2012