Permalink
Commits on Apr 7, 2011
  1. git-p4: replace each tab with 8 spaces for consistency

    splicer authored and gitster committed Apr 7, 2011
    Note that the majority of git-p4 uses spaces, not tabs, for indentation.
    Consistent indentation is a good hygiene for Python scripts, and mixing
    tabs and spaces in Python can lead to hard-to-find bugs.
    
    Signed-off-by: Andrew Garber <andrew@andrewgarber.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 6, 2011
  1. Git 1.7.5-rc1

    gitster committed Apr 6, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Sync with 1.7.4.4

    gitster committed Apr 6, 2011
  3. Git 1.7.4.4

    gitster committed Apr 6, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge branch 'nm/maint-conflicted-submodule-entries' into maint

    gitster committed Apr 6, 2011
    * nm/maint-conflicted-submodule-entries:
      submodule: process conflicting submodules only once
  5. Merge branch 'mg/rev-list-n-reverse-doc' into maint

    gitster committed Apr 6, 2011
    * mg/rev-list-n-reverse-doc:
      git-log.txt,rev-list-options.txt: put option blocks in proper order
      git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting
  6. Merge branch 'jk/maint-remote-mirror-safer'

    gitster committed Apr 6, 2011
    * jk/maint-remote-mirror-safer:
      remote: deprecate --mirror
      remote: separate the concept of push and fetch mirrors
      remote: disallow some nonsensical option combinations
  7. Merge branch 'mg/doc-revisions-txt'

    gitster committed Apr 6, 2011
    * mg/doc-revisions-txt:
      revisions.txt: language improvements
      revisions.txt: structure with a labelled list
      revisions.txt: consistent use of quotes
Commits on Apr 4, 2011
  1. revisions.txt: language improvements

    mjg authored and gitster committed Apr 4, 2011
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'maint'

    gitster committed Apr 4, 2011
    * maint:
      Documentation: trivial grammar fix in core.worktree description
      gitweb: Fix parsing of negative fractional timezones in JavaScript
  3. Merge branch 'jl/submodule-fetch-on-demand'

    gitster committed Apr 4, 2011
    * jl/submodule-fetch-on-demand:
      fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
      submodule update: Don't fetch when the submodule commit is already present
      fetch/pull: Don't recurse into a submodule when commits are already present
      Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
      config: teach the fetch.recurseSubmodules option the 'on-demand' value
      fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
      fetch/pull: recurse into submodules when necessary
    
    Conflicts:
    	builtin/fetch.c
    	submodule.c
  4. Merge branch 'jc/rev-list-options-fix'

    gitster committed Apr 4, 2011
    * jc/rev-list-options-fix:
      "log --cherry-pick" documentation regression fix
  5. Documentation: trivial grammar fix in core.worktree description

    szeder authored and gitster committed Apr 4, 2011
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. gitweb: Fix parsing of negative fractional timezones in JavaScript

    jnareb authored and gitster committed Apr 1, 2011
    Extract converting numerical timezone in the form of '(+|-)HHMM' to
    timezoneOffset function, and fix parsing of negative fractional
    timezones.
    
    This is used to format timestamps in 'blame_incremental' view; this
    complements commit 2b1e172 (gitweb: Fix handling of fractional
    timezones in parse_date, 2011-03-25).
    
    Now
    
      gitweb.cgi/git.git/blame_incremental/3fe5489:/contrib/gitview/gitview#l853
    
    and
    
      gitweb.cgi/git.git/blame/3fe5489:/contrib/gitview/gitview#l853
    
    show the same correct time in author's local timezone in title
    (on mouseover) [Aneesh Kumar K.V, 2006-02-24 00:59:42 +0530].
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. Merge branch 'nm/maint-conflicted-submodule-entries'

    gitster committed Apr 4, 2011
    * nm/maint-conflicted-submodule-entries:
      submodule: process conflicting submodules only once
Commits on Apr 3, 2011
  1. Merge branch 'maint'

    gitster committed Apr 3, 2011
    * maint:
      Start preparing for 1.7.4.4
      pull: do not clobber untracked files on initial pull
      compat: add missing #include <sys/resource.h>
    
    Conflicts:
    	RelNotes
  2. Start preparing for 1.7.4.4

    gitster committed Apr 3, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. pull: do not clobber untracked files on initial pull

    peff authored and gitster committed Mar 25, 2011
    For a pull into an unborn branch, we do not use "git merge"
    at all. Instead, we call read-tree directly. However, we
    used the --reset parameter instead of "-m", which turns off
    the safety features.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge branch 'jc/index-update-if-able' into maint

    gitster committed Apr 3, 2011
    * jc/index-update-if-able:
      update $GIT_INDEX_FILE when there are racily clean entries
      diff/status: refactor opportunistic index update
  5. Merge branch 'lt/default-abbrev' into maint

    gitster committed Apr 3, 2011
    * lt/default-abbrev:
      Rename core.abbrevlength back to core.abbrev
      Make the default abbrev length configurable
  6. Merge branch 'jc/maint-rev-list-culled-boundary' into maint

    gitster committed Apr 3, 2011
    * jc/maint-rev-list-culled-boundary:
      list-objects.c: don't add an unparsed NULL as a pending tree
    
    Conflicts:
    	list-objects.c
  7. Merge branch 'mm/maint-log-n-with-diff-filtering' into maint

    gitster committed Apr 3, 2011
    * mm/maint-log-n-with-diff-filtering:
      log: fix --max-count when used together with -S or -G
  8. Merge branch 'jk/format-patch-multiline-header' into maint

    gitster committed Apr 3, 2011
    * jk/format-patch-multiline-header:
      format-patch: rfc2047-encode newlines in headers
      format-patch: wrap long header lines
      strbuf: add fixed-length version of add_wrapped_text
  9. Merge branch 'jn/maint-instaweb-plack-fix' into maint

    gitster committed Apr 3, 2011
    * jn/maint-instaweb-plack-fix:
      git-instaweb: Change how gitweb.psgi is made runnable as standalone app
  10. Merge branch 'lp/config-vername-check' into maint

    gitster committed Apr 3, 2011
    * lp/config-vername-check:
      Disallow empty section and variable names
      Sanity-check config variable names
  11. compat: add missing #include <sys/resource.h>

    jrn authored and gitster committed Mar 18, 2011
    Starting with commit c793430 (Limit file descriptors used by packs,
    2011-02-28), git uses getrlimit to tell how many file descriptors it
    can use.  Unfortunately it does not include the header declaring that
    function, resulting in compilation errors:
    
     sha1_file.c: In function 'open_packed_git_1':
     sha1_file.c:718: error: storage size of 'lim' isn't known
     sha1_file.c:721: warning: implicit declaration of function 'getrlimit'
     sha1_file.c:721: error: 'RLIMIT_NOFILE' undeclared (first use in this function)
     sha1_file.c:718: warning: unused variable 'lim'
    
    The standard header to include for this is <sys/resource.h> (which on
    some systems itself requires declarations from <sys/types.h> or
    <sys/time.h>).  Probably the problem was missed until now because in
    current glibc sys/resource.h happens to be included by sys/wait.h.
    
    MinGW does not provide sys/resource.h (and compat/mingw takes care of
    providing getrlimit some other way), so add the missing #include to
    the "#ifndef __MINGW32__" block in git-compat-util.h.
    
    Reported-by: Stefan Sperling <stsp@stsp.name>
    Tested-by: Stefan Sperling <stsp@stsp.name> [on OpenBSD]
    Tested-by: Arnaud Lacombe <lacombar@gmail.com> [on FreeBSD 8]
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. git.el: Don't use font-lock-compile-keywords

    wence- authored and gitster committed Feb 4, 2011
    If font-lock is disabled, font-lock-compile-keywords complains.
    Really what we want to do is to replace log-edit's font-lock
    definitions with our own, so define a major mode deriving from
    log-edit and set up font-lock-defaults there.  We then use the
    optional MODE argument to log-edit to set up the major mode of the
    commit buffer appropriately.
    
    Signed-off-by: Lawrence Mitchell <wence@gmx.li>
    Acked-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. t2019-checkout-ambiguous-ref.sh: depend on C_LOCALE_OUTPUT

    avar authored and gitster committed Apr 3, 2011
    The t2019-checkout-ambiguous-ref.sh tests added in v1.7.4.3~12^2
    examines the output for a translatable string, and must be marked
    with C_LOCALE_OUTPUT; otherwise, GETTEXT_POISON=YesPlease tests
    will break.
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  14. Fix two unused variable warnings in gcc 4.6

    toofishes authored and gitster committed Mar 28, 2011
    Seen with -Wunused-but-set-variable.
    
    Signed-off-by: Dan McGee <dpmcgee@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  15. Remove old binaries from .gitignore

    toofishes authored and gitster committed Mar 31, 2011
    These two programs were dumped a while ago.
    
    Signed-off-by: Dan McGee <dpmcgee@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  16. sparse: Fix errors and silence warnings

    bebarino authored and gitster committed Apr 3, 2011
     * load_file() returns a void pointer but is using 0 for the return
       value
    
     * builtin/receive-pack.c forgot to include builtin.h
    
     * packet_trace_prefix can be marked static
    
     * ll_merge takes a pointer for its last argument, not an int
    
     * crc32 expects a pointer as the second argument but Z_NULL is defined
       to be 0 (see 38f4d13 sparse fix: Using plain integer as NULL pointer,
       2006-11-18 for more info)
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  17. Update release notes

    gitster committed Apr 3, 2011
    As 1.7.4.3 has backmerged a handful of fixes from the master,
    drop these entries from 1.7.5 release notes.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  18. Sync with 1.7.4.3

    gitster committed Apr 3, 2011
  19. Git 1.7.4.3

    gitster committed Apr 3, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  20. Doc: mention --delta-base-offset is the default for Porcelain commands

    gitster committed Apr 3, 2011
    The underlying pack-objects plumbing command still needs an explicit
    option from the command line, but these days Porcelain passes the
    option, so there is no need for end users to worry about it anymore.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>