Permalink
Commits on Feb 12, 2010
  1. Git 1.7.0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 12, 2010
  2. Merge branch 'maint'

    * maint:
      Fix typo in 1.6.6.2 release notes
      Re-fix check-ref-format documentation mark-up
    gitster committed Feb 12, 2010
  3. Fix typo in 1.6.6.2 release notes

    Of course, these are changes since 1.6.6.1; changes since 1.6.6.2
    would have been nil.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 12, 2010
  4. Re-fix check-ref-format documentation mark-up

    It is not double-backslash we forbid; backslashes are forbidden since
    a4c2e69 (Disallow '\' in ref names, 2009-05-08)
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 12, 2010
  5. archive documentation: attributes are taken from the tree by default

    By default, git-archive takes attributes from the tree being archived.
    People however often wonder why their attempts to affect the way how the
    command archives their tree by changing .gitattributes in their work tree
    fail.
    
    Add a bit of explanatory note to tell them how to achieve what they want
    to do.
    
    Noticed-by: Francois Marier
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 10, 2010
  6. Documentation: minor fixes to RelNotes-1.7.0

    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Feb 12, 2010
  7. bash: support 'git am's new '--continue' option

    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    szeder committed with gitster Feb 12, 2010
  8. Merge branch 'maint'

    * maint:
      filter-branch: Fix error message for --prune-empty --commit-filter
    gitster committed Feb 12, 2010
  9. filter-branch: Fix error message for --prune-empty --commit-filter

    Running filter-branch with --prune-empty and --commit-filter reports:
    
      "Cannot set --prune-empty and --filter-commit at the same time".
    
    Change it to use the correct option name: --commit-filter
    
    Signed-off-by: Jacob Helwig <jacob.helwig@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jhelwig committed with gitster Feb 12, 2010
  10. am: switch --resolved to --continue

    Rebase calls this same function "--continue", which means
    users may be trained to type it. There is no reason to
    deprecate --resolved (or -r), so we will keep it as a
    synonym.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Feb 11, 2010
Commits on Feb 10, 2010
  1. Update draft release notes to 1.7.0 one more time

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 10, 2010
  2. Sync with 1.6.6.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 10, 2010
  3. Git 1.6.6.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 10, 2010
  4. Merge branch 'maint-1.6.5' into maint

    * maint-1.6.5:
      t8003: check exit code of command and error message separately
    gitster committed Feb 10, 2010
  5. t8003: check exit code of command and error message separately

    Shell reports exit status only from the most downstream command
    in a pipeline.  In these tests, we want to make sure that the
    command fails in a controlled way, and produces a correct error
    message.
    
    This issue was known by Jay who submitted the patch, and also was
    pointed out by Hannes during the review process, but I forgot to
    fix it up before applying.  Sorry about that.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 9, 2010
  6. Merge branch 'sp/maint-fast-import-large-blob' into maint

    * sp/maint-fast-import-large-blob:
      fast-import: Stream very large blobs directly to pack
    gitster committed Feb 10, 2010
  7. Merge branch 'gp/maint-cvsserver' into maint

    * gp/maint-cvsserver:
      git-cvsserver: allow regex metacharacters in CVSROOT
    gitster committed Feb 10, 2010
  8. Merge branch 'jc/maint-reflog-bad-timestamp' into maint

    * jc/maint-reflog-bad-timestamp:
      t0101: use a fixed timestamp when searching in the reflog
      Update @{bogus.timestamp} fix not to die()
      approxidate_careful() reports errorneous date string
    gitster committed Feb 10, 2010
  9. Merge branch 'il/maint-xmallocz' into maint

    * il/maint-xmallocz:
      Fix integer overflow in unpack_compressed_entry()
      Fix integer overflow in unpack_sha1_rest()
      Fix integer overflow in patch_delta()
      Add xmallocz()
    gitster committed Feb 10, 2010
  10. Merge branch 'jh/maint-config-file-prefix' into maint

    * jh/maint-config-file-prefix:
      builtin-config: Fix crash when using "-f <relative path>" from non-root dir
    gitster committed Feb 10, 2010
  11. Merge branch 'nd/include-termios-for-osol' into maint

    * nd/include-termios-for-osol:
      Add missing #include to support TIOCGWINSZ on Solaris
    gitster committed Feb 10, 2010
  12. Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maint

    * jc/maint-1.6.1-checkout-m-custom-merge:
      checkout -m path: fix recreating conflicts
    
    Conflicts:
    	t/t7201-co.sh
    gitster committed Feb 10, 2010
  13. Merge branch 'rs/maint-archive-match-pathspec' into maint

    * rs/maint-archive-match-pathspec:
      archive: complain about path specs that don't match anything
    gitster committed Feb 10, 2010
  14. check-ref-format documentation: fix enumeration mark-up

    The last item in the enumerated refname rule was mistakenly made into
    a sub-item of the 7th one.  It should be the 8th one in the list on its
    own.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 10, 2010
  15. Documentation: quote braces in {upstream} notation

    The lack of quoting made the entire line disappear.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Feb 10, 2010
Commits on Feb 9, 2010
  1. t3902: Protect against OS X normalization

    8424981: "Fix invalid read in quote_c_style_counted" introduced a test
    that used "caractère spécial" as a directory name.
    
    Git creates it as "caract\303\250re sp\303\251cial"
    OS X stores it as "caracte\314\200re spe\314\201cial"
    
    To work around this problem, use the already introduced $FN as the
    directory name.
    
    Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Benabik committed with gitster Feb 9, 2010
  2. Merge branch 'maint'

    * maint:
      blame: prevent a segv when -L given start > EOF
      git-push: document all the status flags used in the output
      Fix parsing of imap.preformattedHTML and imap.sslverify
      git-add documentation: Fix shell quoting example
    gitster committed Feb 9, 2010
  3. Merge branch 'maint-1.6.5' into maint

    * maint-1.6.5:
      blame: prevent a segv when -L given start > EOF
    gitster committed Feb 9, 2010
  4. blame: prevent a segv when -L given start > EOF

    blame would segv if given -L <lineno> with <lineno> past the end of the file.
    While we're fixing the bug, add test cases for an invalid <start> when called
    as -L <start>,<end> or -L<start>.
    
    Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jaysoffian committed with gitster Feb 9, 2010
  5. Merge branch 'jc/maint-push-doc-status' into maint

    * jc/maint-push-doc-status:
      git-push: document all the status flags used in the output
    gitster committed Feb 9, 2010
  6. git-push: document all the status flags used in the output

    We didn't talk about '-' (deletion), '*' (addition), nor '+' (forced).
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 9, 2010
Commits on Feb 8, 2010
  1. Merge branch 'jc/maint-imap-config-parse' into maint

    * jc/maint-imap-config-parse:
      Fix parsing of imap.preformattedHTML and imap.sslverify
    gitster committed Feb 8, 2010
  2. Fix parsing of imap.preformattedHTML and imap.sslverify

    These two variables are boolean and can lack "= value" in the
    configuration file.  Do not reject such input early in the
    parser callback function.
    
    Also the key are downcased before being given to the callback,
    so we should run strcmp() with keyword spelled in all-lowercase.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 6, 2010
  3. Merge branch 'jc/maint-doc-git-add-example' into maint

    * jc/maint-doc-git-add-example:
      git-add documentation: Fix shell quoting example
    gitster committed Feb 8, 2010
  4. git-add documentation: Fix shell quoting example

    When 921177f (Documentation: improve "add", "pull" and "format-patch"
    examples, 2008-05-07) converted this from enumeration header to displayed
    text, it failed to adjust for the AsciiDoc's rule to quote backslashes.
    In displayed text, backslash is shown verbatim, while in enumeration
    header, we need to double it.
    
    We have a similar construct in git-rm.txt documentation, and need to be
    careful when somebody wants to update it to match the style of the "git
    add" example.
    
    Noticed by: Greg Bacon <gbacon@dbresearch.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 8, 2010