Permalink
Commits on Jul 11, 2012
  1. Git 1.7.11.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 11, 2012
  2. Merge branch 'jc/maint-blame-unique-abbrev' into maint

    "git blame" did not try to make sure that the abbreviated commit
    object names in its output are unique.
    
    * jc/maint-blame-unique-abbrev:
      blame: compute abbreviation width that ensures uniqueness
    gitster committed Jul 11, 2012
  3. Merge branch 'rj/platform-pread-may-be-thread-unsafe' into maint

    On Cygwin, the platform pread(2) is not thread safe, just like our own
    compat/ emulation, and cannot be used in the index-pack program.
    Makefile variable NO_THREAD_SAFE_PREAD can be defined to avoid use of
    this function in a threaded program.
    
    * rj/platform-pread-may-be-thread-unsafe:
      index-pack: Disable threading on cygwin
    gitster committed Jul 11, 2012
  4. Merge branch 'th/diff-no-index-fixes' into maint

    "git diff --no-index" did not correctly handle relative paths and
    did not correctly give exit codes when run under "--quiet" option.
    
    * th/diff-no-index-fixes:
      diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds changes
      diff: handle relative paths in no-index
    gitster committed Jul 11, 2012
  5. Merge branch 'nd/clone-single-fix' into maint

    "git clone --single-branch" to clone a single branch did not limit
    the cloning to the specified branch.
    
    * nd/clone-single-fix:
      clone: fix ref selection in --single-branch --branch=xxx
    gitster committed Jul 11, 2012
  6. Merge branch 'jc/rev-list-simplify-merges-first-parent' into maint

    When "git log" gets "--simplify-merges/by-decoration" together with
    "--first-parent", the combination of these options makes the
    simplification logic to use in-core commit objects that haven't been
    examined for relevance, either producing incorrect result or taking
    too long to produce any output.  Teach the simplification logic to
    ignore commits that the first-parent traversal logic ignored when
    both are in effect to work around the issue.
    
    * jc/rev-list-simplify-merges-first-parent:
      revision: ignore side parents while running simplify-merges
      revision: note the lack of free() in simplify_merges()
      revision: "simplify" options imply topo-order sort
    gitster committed Jul 11, 2012
  7. Merge branch 'hv/submodule-update-nuke-submodules' into maint

    "git add" allows adding a regular file to the path where a submodule
    used to exist, but "git update-index" did not allow an equivalent
    operation to Porcelain writers.
    
    * hv/submodule-update-nuke-submodules:
      update-index: allow overwriting existing submodule index entries
    gitster committed Jul 11, 2012
  8. Merge branch 'jk/diff-no-index-pager' into maint

    "git diff --no-index" did not work with pagers correctly.
    
    * jk/diff-no-index-pager:
      do not run pager with diff --no-index --quiet
      fix pager.diff with diff --no-index
    gitster committed Jul 11, 2012
  9. Merge branch 'mm/verify-filename-fix' into maint

    "git diff COPYING HEAD:COPYING" gave a nonsense error message that
    claimed that the treeish HEAD did not have COPYING in it.
    
    * mm/verify-filename-fix:
      verify_filename(): ask the caller to chose the kind of diagnosis
      sha1_name: do not trigger detailed diagnosis for file arguments
    gitster committed Jul 11, 2012
  10. Merge branch 'cn/cherry-pick-range-docs' into maint

    The documentation for "git cherry-pick A B..C" was misleading.
    
    * cn/cherry-pick-range-docs:
      git-cherry-pick.txt: clarify the use of revision range notation
      Documentation: --no-walk is no-op if range is specified
    gitster committed Jul 11, 2012
  11. Merge branch 'jc/ustar-checksum-is-unsigned' into maint

    "git archive" incorrectly computed the header checksum; the symptom
    was observed only when using pathnames with hi-bit set.
    
    * jc/ustar-checksum-is-unsigned:
      archive: ustar header checksum is computed unsigned
    gitster committed Jul 11, 2012
  12. Merge branch 'jc/bundle-complete-notice' into maint

    Running "git bundle verify" on a bundle that records a complete
    history said "it requires these 0 commits".
    
    * jc/bundle-complete-notice:
      tweak "bundle verify" of a complete history
    gitster committed Jul 11, 2012
  13. Merge branch 'jc/ls-files-i-dir' into maint

    "git ls-files --exclude=t -i" did not consider anything under t/ as
    excluded, as it did not pay attention to exclusion of leading paths
    while walking the index.  Other two users of excluded() are also
    updated.
    
    * jc/ls-files-i-dir:
      dir.c: make excluded() file scope static
      unpack-trees.c: use path_excluded() in check_ok_to_remove()
      builtin/add.c: use path_excluded()
      path_excluded(): update API to less cache-entry centric
      ls-files -i: micro-optimize path_excluded()
      ls-files -i: pay attention to exclusion of leading paths
    gitster committed Jul 11, 2012
  14. Merge branch 'jc/request-pull-match-tagname' into maint

    "git request-pull $url dev" when the tip of "dev" branch was tagged
    with "ext4-for-linus" used the contents from the tag in the output
    but still asked the "dev" branch to be pulled, not the tag.
    
    * jc/request-pull-match-tagname:
      request-pull: really favor a matching tag
    gitster committed Jul 11, 2012
Commits on Jul 2, 2012
  1. Merge branch 'maint' of git://github.com/git-l10n/git-po into maint

    Update Swedish translation (1066t0f0u)
    gitster committed Jul 2, 2012
  2. blame: compute abbreviation width that ensures uniqueness

    Julia Lawall noticed that in linux-next repository the commit object
    60d5c9f5 (shown with the default abbreviation width baked into "git
    blame") in output from
    
      $ git blame -L 3675,3675 60d5c9f5b -- \
          drivers/staging/brcm80211/brcmfmac/wl_iw.c
    
    is no longer unique in the repository, which results in "short SHA1
    60d5c9f5 is ambiguous".
    
    Compute the minimum abbreviation width that ensures uniqueness when
    the user did not specify the --abbrev option to avoid this.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 2, 2012
Commits on Jul 1, 2012
  1. Update Swedish translation (1066t0f0u)

    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    nafmo committed Jul 1, 2012
Commits on Jun 26, 2012
  1. index-pack: Disable threading on cygwin

    The Cygwin implementation of pread() is not thread-safe since, just
    like the emulation provided by compat/pread.c, it uses a sequence of
    seek-read-seek calls. In order to avoid failues due to thread-safety
    issues, commit b038a61 disables threading when NO_PREAD is defined.
    (ie when using the emulation code in compat/pread.c).
    
    We introduce a new build variable, NO_THREAD_SAFE_PREAD, which allows
    use to disable the threaded index-pack code on cygwin, in addition to
    the above NO_PREAD case.
    
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 26, 2012
Commits on Jun 25, 2012
  1. git-submodule.sh: fix filename in comment.

    Signed-off-by: Michał Górny <mgorny@gentoo.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mgorny committed with gitster Jun 25, 2012
  2. git-add--interactive.perl: Remove two unused variables

    The patch 8f0bef6 refactored this script and made the variable $fh
    unneeded in subs diff_applies and patch_update_file, but forgot to
    remove them.
    
    Signed-off-by: Thomas Badie <badie@lrde.epita.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    tbadie committed with gitster Jun 24, 2012
Commits on Jun 22, 2012
  1. Documentation: Fix misspellings

    Signed-off-by: Leila Muhtasib <muhtasib@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    muhtasib committed with gitster Jun 22, 2012
  2. clone: fix ref selection in --single-branch --branch=xxx

     - do not fetch HEAD
     - do not also fetch refs following "xxx"
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    pclouds committed with gitster Jun 22, 2012
  3. diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' …

    …finds changes
    
    When running 'git diff --quiet <file1> <file2>', if file1 or file2
    is outside the repository, it will exit(0) even if the files differ.
    It should exit(1) when they differ.
    
    This happens because 'diff_no_index' looks at the 'found_changes'
    member from 'diff_options' to determine if changes were made.  This
    is the wrong thing to do, since it is only set if xdiff is actually
    run and it finds a change (the diff machinery will optimize out the
    xdiff call when it is not necessary) and in that case HAS_CHANGED
    flag needs to be taken into account.
    
    Use diff_result_code() that knows all these details for the correct
    exit value instead.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    thenigan committed with gitster Jun 21, 2012
  4. diff: handle relative paths in no-index

    When diff-no-index is given a relative path to a file outside the
    repository, it aborts with error. However, if the file is given
    using an absolute path, the diff runs as expected. The two cases
    should be treated the same.
    
    Tests and commit message by Tim Henigan.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Jun 21, 2012
Commits on Jun 21, 2012
  1. Git 1.7.11.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 21, 2012
  2. docs: always define git-relative-html-prefix attribute

    Commit fe77b41 introduced a new attribute to let the linkgit macro
    create cross-directory HTML references from the technical/ and howto/
    subdirectories back to the main documentation. We define that attribute
    to "../" on the command-line when building inside those subdirectories,
    and otherwise leave it unset under the assumption that it would default
    to being blank.  Instead, asciidoc omits the link entirely, leading to
    broken documentation. Fix this by defining git-relative-html-prefix to
    blank in asciidoc.conf (and an instance on the command-line, when
    present, will override it).
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Jun 21, 2012
Commits on Jun 19, 2012
  1. git-commit-tree(1): update synopsis

    Even with many new kinds of options, the command still takes the
    single <tree> as the first argument.
    
    Probably we would want to update the command to allow it to take
    <tree>-ish at the end for consistency.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 19, 2012
  2. Documentation: spelling fixes

    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Miklos Vajna committed with gitster Jun 19, 2012
Commits on Jun 18, 2012
  1. verify_filename(): ask the caller to chose the kind of diagnosis

    verify_filename() can be called in two different contexts. Either we
    just tried to interpret a string as an object name, and it fails, so
    we try looking for a working tree file (i.e. we finished looking at
    revs that come earlier on the command line, and the next argument
    must be a pathname), or we _know_ that we are looking for a
    pathname, and shouldn't even try interpreting the string as an
    object name.
    
    For example, with this change, we get:
    
      $ git log COPYING HEAD:inexistant
      fatal: HEAD:inexistant: no such path in the working tree.
      Use '-- <path>...' to specify paths that do not exist locally.
      $ git log HEAD:inexistant
      fatal: Path 'inexistant' does not exist in 'HEAD'
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    moy committed with gitster Jun 18, 2012
  2. sha1_name: do not trigger detailed diagnosis for file arguments

    diagnose_invalid_sha1_path() is meant to be called to diagnose a
    misspelt <treeish>:<pathname> when <pathname> does not exist in
    <treeish>.  However, the code may call it if <treeish>:<pathname> is
    invalid (which triggers another call with only_to_die == 1), but for
    another reason. This happens when calling e.g.
    
      git log existing-file HEAD:existing-file
    
    because existing-file is a path and not a revision, the code
    verifies that the arguments that follow to be paths.  This leads to
    an incorrect message like "existing-file does not exist in HEAD",
    even though the path exists in HEAD.
    
    Check that the search for <pathname> in <treeish> fails before
    triggering the diagnosis.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    moy committed with gitster Jun 18, 2012
Commits on Jun 17, 2012
  1. Git 1.7.11

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 17, 2012
  2. Sync with 1.7.10.5

    gitster committed Jun 17, 2012
  3. Git 1.7.10.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 17, 2012
  4. Do not autosquash in case of an implied interactive rebase

    The option to autosquash is only used in case of an interactive rebase.
    When merges are preserved, rebase uses an interactive rebase internally,
    but in this case autosquash should still be disabled.
    
    Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    vfr-nl committed with gitster May 24, 2012
  5. Merge branch 'js/maint-fast-export-mark-error' into maint

    "git fast-export" did not give a readable error message when the same
    mark erroneously appeared twice in the --import-marks input.
    gitster committed Jun 17, 2012