Skip to content
Commits on Apr 10, 2010
  1. @gitster

    Git 1.7.1-rc1

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

    Merge branch 'mr/gitweb-jsmin'

    gitster committed
    * mr/gitweb-jsmin:
      gitweb: update INSTALL to use shorter make target
      gitweb: add documentation to INSTALL regarding gitweb.js
      instaweb: add minification awareness
      Gitweb: add autoconfigure support for minifiers
      Gitweb: add support for minifying gitweb.css
      Gitweb: add ignore and clean rules for minified files
  3. @gitster

    Merge branch 'jl/maint-submodule-gitfile-awareness'

    gitster committed
    * jl/maint-submodule-gitfile-awareness:
      Teach diff --submodule and status to handle .git files in submodules
  4. @jlehmann @gitster

    Teach diff --submodule and status to handle .git files in submodules

    jlehmann committed with gitster
    The simple test for an existing .git directory gives an incorrect result
    if .git is a file that records "gitdir: overthere". So for submodules that
    use a .git file, "git status" and the diff family - when the "--submodule"
    option is given - did assume the submodule was not populated at all when
    a .git file was used, thus generating wrong output or no output at all.
    
    This is fixed by using read_gitfile_gently() to get the correct location
    of the .git directory. While at it, is_submodule_modified() was cleaned up
    to use the "dir" member of "struct child_process" instead of setting the
    GIT_WORK_TREE and GIT_DIR environment variables.
    
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    Merge branch 'maint'

    gitster committed
    * maint:
      Let check_preimage() use memset() to initialize "struct checkout"
      fetch/push: fix usage strings
  6. @jlehmann @gitster

    Let check_preimage() use memset() to initialize "struct checkout"

    jlehmann committed with gitster
    Every code site except check_preimage() uses either memset() or declares
    a static instance of "struct checkout" to achieve proper initialization.
    Lets use memset() instead of explicit initialization of all members here
    too to be on the safe side in case this structure is expanded someday.
    
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @gitster

    Merge branch 'ef/maint-empty-commit-log' into maint

    gitster committed
    * ef/maint-empty-commit-log:
      rev-list: fix --pretty=oneline with empty message
  8. @gitster

    Merge branch 'jc/conflict-marker-size' into maint

    gitster committed
    * jc/conflict-marker-size:
      diff --check: honor conflict-marker-size attribute
  9. @gitster

    Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' int…

    gitster committed
    …o maint
    
    * sp/maint-http-backend-die-triggers-die-recursively:
      http-backend: Don't infinite loop during die()
  10. @gitster

    Merge branch 'mg/maint-send-email-lazy-editor' into maint

    gitster committed
    * mg/maint-send-email-lazy-editor:
      send-email: lazily assign editor variable
  11. @gitster

    Merge branch 'rr/imap-send-unconfuse-from-line' into maint

    gitster committed
    * rr/imap-send-unconfuse-from-line:
      imap-send: Remove limitation on message body
  12. @gitster

    Merge branch 'rb/maint-python-path' into maint

    gitster committed
    * rb/maint-python-path:
      Correct references to /usr/bin/python which does not exist on FreeBSD
  13. @gitster

    Merge branch 'gh/maint-stash-show-error-message' into maint

    gitster committed
    * gh/maint-stash-show-error-message:
      Improve error messages from 'git stash show'
  14. @gitster

    Merge branch 'mg/mailmap-update' into maint

    gitster committed
    * mg/mailmap-update:
      .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
  15. @gitster

    Merge branch 'bc/maint-daemon-sans-ss-family' into maint

    gitster committed
    * bc/maint-daemon-sans-ss-family:
      daemon.c: avoid accessing ss_family member of struct sockaddr_storage
  16. @rctay @gitster

    fetch/push: fix usage strings

    rctay committed with gitster
     - use "<options>" instead of just "options".
     - use "[<repository> [<refspec>...]]" to indicate that <repository> and
       <refspec> are optional, and that <refspec> cannot be specified
       without specifying <repository>.
    
    Note that when called without specifying <repository> (eg. "git fetch
    -f"), it is accurate to say that the "git fetch [<options>]
    [<repository> ...]" case takes precedence over "git fetch [<options>]
    <group>".
    
    Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  17. @gitster

    Merge branch 'rc/maint-reflog-msg-for-forced-branch'

    gitster committed
    * rc/maint-reflog-msg-for-forced-branch:
      branch: say "Reset to" in reflog entries for 'git branch -f' operations
    
    Conflicts:
    	builtin-branch.c
  18. @rctay @gitster

    branch: say "Reset to" in reflog entries for 'git branch -f' operations

    rctay committed with gitster
    In 5f856dd (fix reflog entries for "git-branch"), it is mentioned that
    'git branch -f' is intended to be equivalent to 'git reset'. Since we
    usually say "reset to <commit>" in the git-reset Documentation and
    elsewhere, it would make sense to say "Reset to" here as well, instead
    of "Reset from" previously.
    
    Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 9, 2010
  1. @gitster
  2. @gitster

    diff.c: work around pointer constness warnings

    gitster committed
    The textconv leak fix introduced two invocations of free() to release
    memory pointed by "const char *", which get annoying compiler warning.
  3. @gitster

    Merge branch 'maint'

    gitster committed
    * maint:
      docs: clarify "branch -l"
Commits on Apr 8, 2010
  1. @peff @gitster

    docs: clarify "branch -l"

    peff committed with gitster
    This option is mostly useless these days because we turn on
    reflogs by default in non-bare repos.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 7, 2010
  1. @gitster

    Merge branch 'mg/notes-reflog'

    gitster committed
    * mg/notes-reflog:
      refs.c: Write reflogs for notes just like for branch heads
      t3301-notes: Test the creation of reflog entries
  2. @gitster

    Merge branch 'jn/mailinfo-scissors'

    gitster committed
    * jn/mailinfo-scissors:
      Teach mailinfo %< as an alternative scissors mark
  3. @peff @gitster

    fix typos and grammar in 1.7.1 draft release notes

    peff committed with gitster
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @drafnel @gitster

    notes.h: declare bit field as unsigned to silence compiler complaints

    drafnel committed with gitster
    The IRIX MIPSPro compiler complains like this:
    
       cc-1107 c99: WARNING File = notes.h, Line = 215
         A signed bit field has a length of 1 bit.
    
               int suppress_default_notes:1;
                   ^
    
    'unsigned' is what was intended, so lets make it so.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 6, 2010
  1. @gitster

    Git 1.7.1-rc0

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

    Merge branch 'da/maint-python-startup'

    gitster committed
    * da/maint-python-startup:
      Makefile: Remove usage of deprecated Python "has_key" method
  3. @gitster

    Merge branch 'ic/bash-completion-rpm'

    gitster committed
    * ic/bash-completion-rpm:
      RPM spec: include bash completion support
  4. @gitster

    Merge branch 'sb/fmt-merge-msg'

    gitster committed
    * sb/fmt-merge-msg:
      fmt-merge-msg: hide summary option
      fmt-merge-msg: remove custom string_list implementation
      string-list: add unsorted_string_list_lookup()
      fmt-merge-msg: use pretty.c routines
      t6200: test fmt-merge-msg more
      t6200: modernize with test_tick
      fmt-merge-msg: be quiet if nothing to merge
  5. @gitster

    Merge branch 'jc/conflict-marker-size'

    gitster committed
    * jc/conflict-marker-size:
      diff --check: honor conflict-marker-size attribute
  6. @gitster

    Merge branch 'ef/maint-empty-commit-log'

    gitster committed
    * ef/maint-empty-commit-log:
      rev-list: fix --pretty=oneline with empty message
  7. @gitster

    Merge branch 'sg/bash-completion'

    gitster committed
    * sg/bash-completion:
      bash: completion for gitk aliases
      bash: support user-supplied completion scripts for aliases
      bash: support user-supplied completion scripts for user's git commands
      bash: improve aliased command recognition
Commits on Apr 5, 2010
  1. @gitster

    Revert "Link against libiconv on IRIX"

    gitster committed
    Brandon Casey reports:
    
        Subject: Re: [PATCH] Link against libiconv on IRIX
        Date: Mon, 05 Apr 2010 11:45:32 -0500
        Message-Id: <1UypQMCHLT57SnjSQIM66RTkLalsvavG8xXoQJv4rEQ@cipher.nrlssc.navy.mil>
    
        This breaks compilation on IRIX 6.5.29m for me since there
        is no separate libiconv.so.
    
        What version of IRIX are you using?
    
        On my system, even the iconv utility doesn't link against
        a libiconv shared object.  It seems the iconv functionality is in libc.
    
           # ldd /usr/bin/iconv
    	       libc.so.1  =>    /usr/lib32/libc.so.1
    
        Could it be that you are using a third party iconv library?
        I've experienced this on another system and the problem was related
        to curl.  In that case, curl was linked against an external iconv and
        not the native library, so if I tried to build with curl support, I had
        to also build against the external iconv library.
    
    While we wait for an improved solution, revert the regression caused by
    2170422.
Commits on Apr 4, 2010
  1. @gitster

    Merge branch 'maint'

    gitster committed
    * maint:
      pack-protocol.txt: fix pkt-line lengths
      pack-protocol.txt: fix spelling
Something went wrong with that request. Please try again.