Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Sep 18, 2012
  1. @gitster

    Git 1.7.12.1

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'er/doc-fast-import-done' into maint

    gitster authored
    * er/doc-fast-import-done:
      fast-import: document the --done option
  3. @gitster

    Merge branch 'jk/config-warn-on-inaccessible-paths' into maint

    gitster authored
    The attribute system may be asked for a path that itself or its
    leading directories no longer exists in the working tree, and it is
    fine if we cannot open .gitattribute file in such a case.  Failure
    to open per-directory .gitattributes with error status other than
    ENOENT and ENOTDIR should be diagnosed.
    
    * jk/config-warn-on-inaccessible-paths:
      attr: failure to open a .gitattributes file is OK with ENOTDIR
      warn_on_inaccessible(): a helper to warn on inaccessible paths
      attr: warn on inaccessible attribute files
      gitignore: report access errors of exclude files
      config: warn on inaccessible files
  4. @PhilipOakley @gitster

    Doc: Improve shallow depth wording

    PhilipOakley authored gitster committed
    Avoid confusion in compound sentence about the start of the commit set
    and the depth measure. Use two sentences.
    
    Signed-off-by: Philip Oakley <philipoakley@iee.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @andreas-schwab @gitster

    Documentation/git-filter-branch: Move note about effect of removing c…

    andreas-schwab authored gitster committed
    …ommits
    
    The note that explains that changes introduced by removed commits are
    preserved should be placed directly after the paragraph that describes
    such commits removal.  Otherwise the reference to "the commits" appears
    out of context.
    
    Also the big example that follows "Consider this history" is about
    rewriting part of the history DAG.  Move the paragraph that
    describes the operation close to it.
    
    Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 17, 2012
  1. @artagnon @gitster

    t/perf: add "trash directory" to .gitignore

    artagnon authored gitster committed
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Add missing -z to git check-attr usage text for consistency with man …

    Adam Spiers authored gitster committed
    …page
    
    Signed-off-by: Adam Spiers <git@adamspiers.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    git-jump: ignore (custom) prefix in diff mode

    Mischa POSLAWSKY authored gitster committed
    Matching the default file prefix b/ does not yield any results if config
    option diff.noprefix or diff.mnemonicprefix is enabled.
    
    Signed-off-by: Mischa POSLAWSKY <git@shiar.nl>
    Acked-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @wjl @gitster

    Documentation: indent-with-non-tab uses "equivalent tabs" not 8

    wjl authored gitster committed
    Update the documentation of the core.whitespace option
    "indent-with-non-tab" to correctly reflect that it catches the use of
    spaces instead of the equivalent tabs, rather than a fixed number.
    
    Signed-off-by: Wesley J. Landaker <wjl@icecavern.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @ybelkadi @gitster

    completion: add --no-edit to git-commit

    ybelkadi authored gitster committed
    Signed-off-by: Yacine Belkadi <yacine.belkadi.1@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 15, 2012
  1. @gitster

    Draft release notes to 1.7.12.1

    gitster authored
    We are almost there...
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'sb/send-email-reconfirm-fix' into maint

    gitster authored
    * sb/send-email-reconfirm-fix:
      send-email: initial_to and initial_reply_to are both optional
  3. @gitster

    Merge branch 'jc/send-email-reconfirm' into maint

    gitster authored
    * jc/send-email-reconfirm:
      send-email: validate & reconfirm interactive responses
  4. @gitster

    Merge branch 'mz/cherry-pick-cmdline-order' into maint

    gitster authored
    * mz/cherry-pick-cmdline-order:
      cherry-pick/revert: respect order of revisions to pick
      demonstrate broken 'git cherry-pick three one two'
      teach log --no-walk=unsorted, which avoids sorting
  5. @gitster

    Sync with 1.7.11.7

    gitster authored
  6. @gitster

    Git 1.7.11.7

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @gitster

    Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11

    gitster authored
    * jk/maint-quiet-is-synonym-to-s-in-log:
      log: fix --quiet synonym for -s
  8. @gitster

    Merge branch 'jc/maint-ident-missing-human-name' into maint-1.7.11

    gitster authored
    * jc/maint-ident-missing-human-name:
      split_ident_line(): make best effort when parsing author/committer line
  9. @gitster

    Merge branch 'rj/test-regex' into maint-1.7.11

    gitster authored
    * rj/test-regex:
      test-regex: Add a test to check for a bug in the regex routines
  10. @gitster

    Merge branch 'da/gitk-reload-tag-contents' into maint-1.7.11

    gitster authored
    * da/gitk-reload-tag-contents:
      gitk: Rename 'tagcontents' to 'cached_tagcontent'
      gitk: Teach "Reread references" to reload tags
      gitk: Avoid Meta1-F5
  11. @gitster

    Merge branch 'jc/maint-checkout-fileglob-doc' into maint-1.7.11

    gitster authored
    * jc/maint-checkout-fileglob-doc:
      gitcli: contrast wildcard given to shell and to git
      gitcli: formatting fix
      Document file-glob for "git checkout -- '*.c'"
Commits on Sep 14, 2012
  1. @gitster

    attr: failure to open a .gitattributes file is OK with ENOTDIR

    gitster authored
    Often we consult an in-tree .gitattributes file that exists per
    directory.  Majority of directories do not usually have such a file,
    and it is perfectly fine if we cannot open it because there is no
    such file, but we do want to know when there is an I/O or permission
    error.  Earlier, we made the codepath warn when we fail to open it
    for reasons other than ENOENT for that reason.
    
    We however sometimes have to attempt to open the .gitattributes file
    from a directory that does not exist in the commit that is currently
    checked out.  "git pack-objects" wants to know if a path is marked
    with "-delta" attributes, and "git archive" wants to know about
    export-ignore and export-subst attributes.  Both commands may and do
    need to ask the attributes system about paths in an arbitrary
    commit.  "git diff", after removing an entire directory, may want to
    know textconv on paths that used to be in that directory.
    
    Make sure we also ignore a failure to open per-directory attributes
    file due to ENOTDIR.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 12, 2012
  1. @gitster

    Further merging in preparation for 1.7.12.1

    gitster authored
    Describe the following in the draft release notes:
    
     . jc/apply-binary-p0
     . jc/dotdot-is-parent-directory
     . jc/maint-doc-checkout-b-always-takes-branch-name
     . jk/maint-http-half-auth-push
     . kk/maint-for-each-ref-multi-sort
    
    Yet to be merged before 1.7.12.1 are:
    
     . jk/config-warn-on-inaccessible-paths
     . jk/maint-quiet-is-synonym-to-s-in-log
     . mz/cherry-pick-cmdline-order
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster
  3. @gitster

    Merge branch 'jc/apply-binary-p0' into maint-1.7.11

    gitster authored
    "git apply -p0" did not parse pathnames on "diff --git" line
    correctly.  This caused patches that had pathnames in no other
    places to be mistakenly rejected (most notably, binary patch that
    does not rename nor change mode).  Textual patches, renames or mode
    changes have preimage and postimage pathnames in different places in
    a form that can be parsed unambiguously and did not suffer from this
    problem.
    
    * jc/apply-binary-p0:
      apply: compute patch->def_name correctly under -p0
  4. @gitster

    Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11

    gitster authored
    "git log .." errored out saying it is both rev range and a path when
    there is no disambiguating "--" is on the command line.  Update the
    command line parser to interpret ".." as a path in such a case.
    
    * jc/dotdot-is-parent-directory:
      specifying ranges: we did not mean to make ".." an empty set
  5. @gitster

    Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' into …

    gitster authored
    …maint-1.7.11
    
    The synopsis said "checkout [-B branch]" to make it clear the
    branch name is a parameter to the option, but the heading for the
    option description was "-B::", not "-B branch::", making the
    documentation misleading.
    
    * jc/maint-doc-checkout-b-always-takes-branch-name:
      doc: "git checkout -b/-B/--orphan" always takes a branch name
  6. @gitster

    Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11

    gitster authored
    Pushing to smart HTTP server with recent Git fails without having
    the username in the URL to force authentication, if the server is
    configured to allow GET anonymously, while requiring authentication
    for POST.
    
    * jk/maint-http-half-auth-push:
      http: prompt for credentials on failed POST
      http: factor out http error code handling
      t: test http access to "half-auth" repositories
      t: test basic smart-http authentication
      t/lib-httpd: recognize */smart/* repos as smart-http
      t/lib-httpd: only route auth/dumb to dumb repos
      t5550: factor out http auth setup
      t5550: put auth-required repo in auth/dumb
  7. @gitster

    Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11

    gitster authored
    "git for-each-ref" did not honor multiple "--sort=<key>" arguments
    correctly.
    
    * kk/maint-for-each-ref-multi-sort:
      for-each-ref: Fix sort with multiple keys
      t6300: test sort with multiple keys
Commits on Sep 11, 2012
  1. @gitster

    Further merging down for 1.7.12.1

    gitster authored
    We will wait for a handful of other fixes that have graduated to the
    'master' for 1.8.0 to be tested in the wild and then tag 1.7.12.1:
    
     . mz/cherry-pick-cmdline-order
     . jk/maint-quiet-is-synonym-to-s-in-log
     . jk/maint-http-half-auth-push
     . jc/apply-binary-p0
     . jk/config-warn-on-inaccessible-paths
     . kk/maint-for-each-ref-multi-sort
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Sync with 1.7.11.6

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'js/use-sc-open-max' into maint

    gitster authored
    * js/use-sc-open-max:
      sha1_file.c: introduce get_max_fd_limit() helper
  4. @gitster

    Merge branch 'js/no-curl-easy-strerror-on-old-curl' into maint

    gitster authored
    * js/no-curl-easy-strerror-on-old-curl:
      http.c: don't use curl_easy_strerror prior to curl-7.12.0
  5. @gitster

    Git 1.7.11.6

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @gitster

    Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11

    gitster authored
    * jc/maint-mergetool-style-fix:
      mergetool: style fixes
Something went wrong with that request. Please try again.