Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on May 13, 2009
  1. @gitster

    GIT 1.6.3.1

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 12, 2009
  1. @gitster

    Merge branch 'maint-1.6.2' into maint

    gitster authored
    * maint-1.6.2:
      Revert "checkout branch: prime cache-tree fully"
  2. @gitster

    Merge branch 'jc/maint-read-tree-multi' into maint-1.6.2

    gitster authored
    * jc/maint-read-tree-multi:
      Revert "checkout branch: prime cache-tree fully"
  3. @gitster

    Revert "checkout branch: prime cache-tree fully"

    gitster authored
    The logic in 83ae209 (checkout branch: prime cache-tree fully,
    2009-04-20) is bogus; checkout can switch branches with a dirty
    index and in such a case the tree won't match HEAD.
    
    Add t2014-switch to catch this breakage.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 9, 2009
  1. @aspotashev @gitster

    Documentation: cloning to empty directory is allowed

    aspotashev authored gitster committed
    Cloning into an existing empty directory is now allowed:
    commit 55892d2
    ("Allow cloning to an existing empty directory")
    
    Signed-off-by: Alexander Potashev <aspotashev@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @raalkml @gitster

    Clarify kind of conflict in merge-one-file helper

    raalkml authored gitster committed
    Not as verbose as the recursive merge driver, but better still.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @felipec @gitster

    git config: clarify --add and --get-color

    felipec authored gitster committed
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    archive-tar.c: squelch a type mismatch warning

    gitster authored
    On some systems, giving a value of type time_t to printf "%lo" that
    expects an unsigned long would give a type mismatch warning.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    Start 1.6.3.1 maintenance series.

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

    Merge branch 'maint-1.6.1' into maint-1.6.2

    gitster authored
    * maint-1.6.1:
  7. @gitster

    Merge branch 'maint-1.6.0' into maint-1.6.1

    gitster authored
    * maint-1.6.0:
      dir.c: Fix two minor grammatical errors in comments
Commits on May 7, 2009
  1. @gitster

    GIT 1.6.3

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

    t4029: use sh instead of bash

    pclouds authored gitster committed
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 6, 2009
  1. @gitster

    t4200: convert sed expression which operates on non-text file to perl

    Brandon Casey authored gitster committed
    POSIX only requires sed to work on text files and MERGE_RR is not a text
    file.  Some versions of sed complain that this file is not newline
    terminated, and exit non-zero.  Use perl instead which does not have a
    problem with it.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    t4200: remove two unnecessary lines

    Brandon Casey authored gitster committed
    These two lines appear to be unnecessary.  They set variables which are not
    used afterwards.  The primary motivation to remove them is that the sed
    invocation exits non-zero for seds which require newline termination of
    input files.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    t/annotate-tests.sh: avoid passing a non-newline terminated file to sed

    Brandon Casey authored gitster committed
    Some versions of sed exit non-zero if the file they are supplied is not
    newline terminated.  Solaris's /usr/xpg4/bin/sed is one such sed.  So
    rework this test to avoid doing so.
    
    This affects tests t8001-annotate.sh and t8002-blame.sh.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    t4118: avoid sed invocation on file without terminating newline

    Brandon Casey authored gitster committed
    Some versions of sed exit non-zero if the file they are supplied is not
    newline terminated. Solaris's /usr/xpg4/bin/sed is one such sed.  In
    this case the sed invocation can be avoided entirely since the resulting
    file is equivalent to a previously created file.  So, just copy that file
    into place instead.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    t4118: add missing '&&'

    Brandon Casey authored gitster committed
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @gitster

    t8005: use egrep when extended regular expressions are required

    Brandon Casey authored gitster committed
    Not all versions of grep understand backslashed extended regular
    expressions.  Possibly only gnu grep does.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @gitster

    git-clean doc: the command only affects paths under $(cwd)

    gitster authored
    Fredrik Skolmli and Thomas Rast noticed that it was left unstated that
    "git clean" ran from a subdirectory will not affect anything outside it,
    with or without path limiters.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      improve error message in config.c
      t4018-diff-funcname: add cpp xfuncname pattern to syntax test
      Work around BSD whose typeof(tv.tv_sec) != time_t
      git-am.txt: reword extra headers in message body
      git-am.txt: Use date or value instead of time or timestamp
      git-am.txt: add an 'a', say what 'it' is, simplify a sentence
      dir.c: Fix two minor grammatical errors in comments
      git-svn: fix a sloppy Getopt::Long usage
  9. @gitster

    Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint

    gitster authored
    * rj/maint-1.6.0-svn-parse-fix:
      git-svn: fix a sloppy Getopt::Long usage
  10. @gitster

    Merge branch 'maint-1.6.0' into maint

    gitster authored
    * maint-1.6.0:
      dir.c: Fix two minor grammatical errors in comments
  11. @raalkml @gitster

    improve error message in config.c

    raalkml authored gitster committed
    Show errno if opening a lockfile fails.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. @drafnel @gitster

    t4018-diff-funcname: add cpp xfuncname pattern to syntax test

    drafnel authored gitster committed
    Signed-off-by: Brandon Casey <drafnel@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. @bernd @gitster

    Work around BSD whose typeof(tv.tv_sec) != time_t

    bernd authored gitster committed
    According to POSIX, tv_sec is supposed to be a time_t, but OpenBSD
    (and FreeBSD, too) defines it to be a long, which triggers a type
    mismatch when a pointer to it is given to localtime_r().
    
    Acked-by: Jeff King <peff@peff.net>
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  14. @bebarino @gitster

    git-am.txt: reword extra headers in message body

    bebarino authored gitster committed
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  15. @bebarino @gitster

    git-am.txt: Use date or value instead of time or timestamp

    bebarino authored gitster committed
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  16. @bebarino @gitster

    git-am.txt: add an 'a', say what 'it' is, simplify a sentence

    bebarino authored gitster committed
    It's nice to know that 'it' is git-am or the subject line. Whitespace
    implies characters so just remove characters.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  17. @bebarino @gitster

    completion: complete values for send-email

    bebarino authored gitster committed
    Add completion for --confirm, --suppress-cc, and --smtp-encryption
    command line arguments. Add completion for aliasfiletype and confirm
    configuration variables.
    
    Since --smtp-ssl is deprecated, replace it with --smtp-encryption and
    the two options ssl and tls.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  18. @bebarino @gitster

    completion: complete values for log.date

    bebarino authored gitster committed
    Add raw to the date formats too.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  19. @bebarino @gitster

    completion: complete values for help.format

    bebarino authored gitster committed
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  20. @bebarino @gitster

    completion: add {gui,diff,merge}tool, man, and pager config variables

    bebarino authored gitster committed
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  21. @bebarino @gitster

    completion: add missing configuration variables to _git_config()

    bebarino authored gitster committed
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  22. @allancaffee @gitster

    dir.c: Fix two minor grammatical errors in comments

    allancaffee authored gitster committed
    Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.