Permalink
Commits on Mar 15, 2009
  1. GIT 1.6.2.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 15, 2009
Commits on Mar 13, 2009
  1. Merge branch 'maint-1.6.1' into maint

    * maint-1.6.1:
    gitster committed Mar 13, 2009
  2. Merge branch 'maint-1.6.0' into maint-1.6.1

    * maint-1.6.0:
      bisect: fix another instance of eval'ed string
      bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped
      Support "\" in non-wildcard exclusion entries
    
    Conflicts:
    	git-bisect.sh
    gitster committed Mar 13, 2009
  3. Merge branch 'en/maint-1.6.1-hash-object' into maint-1.6.1

    * en/maint-1.6.1-hash-object:
      Ensure proper setup of git_dir for git-hash-object
    gitster committed Mar 13, 2009
  4. Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.0

    * ks/maint-1.6.0-mailinfo-folded:
      mailinfo: tests for RFC2047 examples
      mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)'
      mailinfo: 'From:' header should be unfold as well
      mailinfo: correctly handle multiline 'Subject:' header
    gitster committed Mar 13, 2009
  5. Merge branch 'cc/maint-1.6.0-bisect-fix' into maint-1.6.0

    * cc/maint-1.6.0-bisect-fix:
      bisect: fix another instance of eval'ed string
      bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped
    gitster committed Mar 13, 2009
  6. Merge branch 'fg/maint-1.6.0-exclude-bq' into maint-1.6.0

    * fg/maint-1.6.0-exclude-bq:
      Support "\" in non-wildcard exclusion entries
    gitster committed Mar 13, 2009
  7. Merge branch 'js/maint-1.6.1-filter-branch-submodule' into maint-1.6.1

    * js/maint-1.6.1-filter-branch-submodule:
      filter-branch: do not consider diverging submodules a 'dirty worktree'
    gitster committed Mar 13, 2009
  8. Merge branch 'gt/maint-1.6.1-utf8-width' into maint-1.6.1

    * gt/maint-1.6.1-utf8-width:
      builtin-blame.c: Use utf8_strwidth for author's names
      utf8: add utf8_strwidth()
    gitster committed Mar 13, 2009
  9. Merge branch 'js/maint-1.6.1-remote-remove-mirror' into maint-1.6.1

    * js/maint-1.6.1-remote-remove-mirror:
      builtin-remote: make rm operation safer in mirrored repository
      builtin-remote: make rm() use properly named variable to hold return value
    gitster committed Mar 13, 2009
  10. Merge branch 'ek/maint-1.6.1-filter-branch-bare' into maint-1.6.1

    * ek/maint-1.6.1-filter-branch-bare:
      filter-branch: Fix fatal error on bare repositories
    gitster committed Mar 13, 2009
  11. Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1

    * jc/maint-1.6.1-add-u-remove-conflicted:
      add -u: do not fail to resolve a path as deleted
    gitster committed Mar 13, 2009
  12. Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1

    * js/maint-1.6.1-rebase-i-submodule:
      Fix submodule squashing into unrelated commit
      rebase -i squashes submodule changes into unrelated commit
    gitster committed Mar 13, 2009
  13. Merge branch 'jc/maint-1.6.1-allow-uninteresting-missing' into maint-…

    …1.6.1
    
    * jc/maint-1.6.1-allow-uninteresting-missing:
      revision traversal: allow UNINTERESTING objects to be missing
    gitster committed Mar 13, 2009
  14. Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.1

    * ks/maint-1.6.0-mailinfo-folded:
      mailinfo: tests for RFC2047 examples
      mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)'
      mailinfo: 'From:' header should be unfold as well
      mailinfo: correctly handle multiline 'Subject:' header
    gitster committed Mar 13, 2009
  15. Merge branch 'jk/maint-1.6.1-cleanup-after-exec-failure' into maint-1…

    ….6.1
    
    * jk/maint-1.6.1-cleanup-after-exec-failure:
      git: use run_command() to execute dashed externals
      run_command(): help callers distinguish errors
      run_command(): handle missing command errors more gracefully
      git: s/run_command/run_builtin/
    gitster committed Mar 13, 2009
  16. Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into maint-1.6.0

    * jc/maint-1.6.0-split-diff-metainfo:
      diff.c: output correct index lines for a split diff
    gitster committed Mar 13, 2009
Commits on Mar 11, 2009
  1. Update draft release notes for 1.6.2.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 11, 2009
  2. Merge branch 'js/maint-send-email' into maint

    * js/maint-send-email:
      send-email: don't create temporary compose file until it is needed
      send-email: --suppress-cc improvements
      send-email: handle multiple Cc addresses when reading mbox message
      send-email: allow send-email to run outside a repo
    gitster committed Mar 11, 2009
  3. Merge branch 'jk/sane-relative-time' into maint

    * jk/sane-relative-time:
      never fallback relative times to absolute
    gitster committed Mar 11, 2009
  4. Merge branch 'jc/maint-add-p-unquote' into maint

    * jc/maint-add-p-unquote:
      git-add -i/-p: learn to unwrap C-quoted paths
    gitster committed Mar 11, 2009
  5. Merge branch 'fg/maint-exclude-bq' into maint

    * fg/maint-exclude-bq:
      Support "\" in non-wildcard exclusion entries
    gitster committed Mar 11, 2009
  6. Merge branch 'en/maint-hash-object' into maint

    * en/maint-hash-object:
      Ensure proper setup of git_dir for git-hash-object
    
    Conflicts:
    	hash-object.c
    gitster committed Mar 11, 2009
Commits on Mar 8, 2009
  1. Merge branch 'maint-1.6.1' into maint

    * maint-1.6.1:
      builtin-revert.c: release index lock when cherry-picking an empty commit
    gitster committed Mar 8, 2009
Commits on Mar 7, 2009
  1. builtin-revert.c: release index lock when cherry-picking an empty commit

    When a cherry-pick of an empty commit is done, release the lock
    held on the index.
    
    The fix is the same as was applied to similar code in 4271666.
    
    Signed-off-by: Chris Johnsen <chris_johnsen@pobox.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ChrisJohnsen committed with gitster Mar 7, 2009
  2. document config --bool-or-int

    The documentation is just a pointer to the --bool and --int
    options, but it makes sense to at least mention that it
    exists.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Mar 7, 2009
  3. t1300: use test_must_fail as appropriate

    Some of the tests checked the exit code manually, even going
    so far as to run git outside of the test_expect harness.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Mar 7, 2009
  4. cleanup: add isascii()

    Add a standard definition of isascii() and use it to replace an open
    coded high-bit test in pretty.c.  While we're there, write the ESC
    char as the more commonly used '\033' instead of as 0x1b to enhance
    its grepability.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    René Scharfe committed with gitster Mar 7, 2009
  5. Documentation: fix badly indented paragraphs in "--bisect-all" descri…

    …ption
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    chriscool committed with gitster Mar 7, 2009
Commits on Mar 5, 2009
  1. Make the 'lock file' exists error more informative

    It looks like someone did 90% of the work, then forgot to actually use
    the function in one place.
    
    Also the helper function did not use the correct variable.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    johnflux committed with gitster Mar 4, 2009
Commits on Mar 4, 2009
  1. Beginning of 1.6.2 maintenance track

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 4, 2009
  2. GIT 1.6.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 4, 2009
  3. Documentation: Typo / spelling / formatting fixes

    Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    MikeRalphson committed with gitster Mar 3, 2009
  4. Documentation: Expand a couple of abbreviations

    These may not be obvious to non-native English speakers
    
    Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    MikeRalphson committed with gitster Mar 3, 2009
  5. Documentation: Typos / spelling fixes in RelNotes

    Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    MikeRalphson committed with gitster Mar 3, 2009