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

    Git 1.7.1-rc0

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

    Merge branch 'da/maint-python-startup'

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

    Merge branch 'ic/bash-completion-rpm'

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

    Merge branch 'sb/fmt-merge-msg'

    * 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
    gitster committed Apr 6, 2010
  5. @gitster

    Merge branch 'jc/conflict-marker-size'

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

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

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

    Merge branch 'sg/bash-completion'

    * 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
    gitster committed Apr 6, 2010
Commits on Apr 5, 2010
  1. @gitster

    Revert "Link against libiconv on IRIX"

    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.
    gitster committed Apr 5, 2010
Commits on Apr 4, 2010
  1. @gitster

    Merge branch 'maint'

    * maint:
      pack-protocol.txt: fix pkt-line lengths
      pack-protocol.txt: fix spelling
    gitster committed Apr 4, 2010
  2. @rctay @gitster

    pack-protocol.txt: fix pkt-line lengths

    Previously, the lengths were 4-bytes short. Fix it such that the lengths
    reflect the total length of the pkt-line, as per spec.
    
    Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    rctay committed with gitster Apr 4, 2010
  3. @rctay @gitster

    pack-protocol.txt: fix spelling

    s/paramater/parameter/.
    
    Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    rctay committed with gitster Apr 4, 2010
Commits on Apr 3, 2010
  1. @gitster

    Merge branch 'mb/rebase-i-no-ff'

    * mb/rebase-i-no-ff:
      Teach rebase the --no-ff option.
    
    Conflicts:
    	git-rebase--interactive.sh
    	t/t3404-rebase-interactive.sh
    gitster committed Apr 3, 2010
  2. @gitster

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

    * sp/maint-http-backend-die-triggers-die-recursively:
      http-backend: Don't infinite loop during die()
    gitster committed Apr 3, 2010
  3. @gitster

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

    * rr/imap-send-unconfuse-from-line:
      imap-send: Remove limitation on message body
    gitster committed Apr 3, 2010
  4. @gitster

    Merge branch 'mg/use-default-abbrev-length-in-rev-list'

    * mg/use-default-abbrev-length-in-rev-list:
      rev-list: use default abbrev length when abbrev-commit is in effect
    gitster committed Apr 3, 2010
  5. @gitster

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

    * mg/maint-send-email-lazy-editor:
      send-email: lazily assign editor variable
    gitster committed Apr 3, 2010
  6. @gitster

    Merge branch 'rb/maint-python-path'

    * rb/maint-python-path:
      Correct references to /usr/bin/python which does not exist on FreeBSD
    gitster committed Apr 3, 2010
  7. @gitster

    Merge branch 'jn/merge-diff3-label'

    * jn/merge-diff3-label:
      merge-recursive: add a label for ancestor
      cherry-pick, revert: add a label for ancestor
      revert: clarify label on conflict hunks
      compat: add mempcpy()
      checkout -m --conflict=diff3: add a label for ancestor
      merge_trees(): add ancestor label parameter for diff3-style output
      merge_file(): add comment explaining behavior wrt conflict style
      checkout --conflict=diff3: add a label for ancestor
      ll_merge(): add ancestor label parameter for diff3-style output
      merge-file --diff3: add a label for ancestor
      xdl_merge(): move file1 and file2 labels to xmparam structure
      xdl_merge(): add optional ancestor label to diff3-style output
      tests: document cherry-pick behavior in face of conflicts
      tests: document format of conflicts from checkout -m
    
    Conflicts:
    	builtin/revert.c
    gitster committed Apr 3, 2010
  8. @gitster

    Merge branch 'ef/cherry-abbrev'

    * ef/cherry-abbrev:
      ls: remove redundant logic
      cherry: support --abbrev option
    gitster committed Apr 3, 2010
  9. @gitster

    Merge branch 'bw/template-tool-buildconfig'

    * bw/template-tool-buildconfig:
      Modernize git calling conventions in hook templates
      Make templates honour SHELL_PATH and PERL_PATH
    gitster committed Apr 3, 2010
  10. @gitster

    Merge branch 'mg/mailmap-update'

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

    Merge branch 'bc/t5505-fix'

    * bc/t5505-fix:
      t/t5505-remote.sh: escape * to prevent interpretation by shell as glob
      t5505: add missing &&
      t5505: remove unnecessary subshell invocations
    gitster committed Apr 3, 2010
  12. @gitster

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

    * gh/maint-stash-show-error-message:
      Improve error messages from 'git stash show'
    gitster committed Apr 3, 2010
  13. @gitster

    Merge branch 'rs/threaded-grep-context'

    * rs/threaded-grep-context:
      grep: enable threading for context line printing
    
    Conflicts:
    	grep.c
    gitster committed Apr 3, 2010
  14. @gitster

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

    * bc/maint-daemon-sans-ss-family:
      daemon.c: avoid accessing ss_family member of struct sockaddr_storage
    gitster committed Apr 3, 2010
  15. @gitster

    Merge branch 'bc/acl-test'

    * bc/acl-test:
      t/t1304: make a second colon optional in the mask ACL check
      t/t1304: set the ACL effective rights mask
      t/t1304: use 'test -r' to test readability rather than looking at mode bits
      t/t1304: set the Default ACL base entries
      t/t1304: avoid -d option to setfacl
    gitster committed Apr 3, 2010
  16. @gitster

    Merge branch 'ja/send-email-ehlo'

    * ja/send-email-ehlo:
      git-send-email.perl - try to give real name of the calling host to HELO/EHLO
      git-send-email.perl: add option --smtp-debug
      git-send-email.perl: improve error message in send_message()
    gitster committed Apr 3, 2010
  17. @gitster

    Merge branch 'do/rebase-i-arbitrary'

    * do/rebase-i-arbitrary:
      rebase--interactive: don't require what's rebased to be a branch
    
    Conflicts:
    	t/t3404-rebase-interactive.sh
    gitster committed Apr 3, 2010
  18. @gitster

    Merge branch 'ak/everyday-git'

    * ak/everyday-git:
      everyday: fsck and gc are not everyday operations
    gitster committed Apr 3, 2010
  19. @jrn @gitster

    Makefile: future-proof Cygwin version check

    Tweak the condition that detects old Cygwin versions to not include
    versions such as 1.8, 1.11, and 2.1.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Apr 3, 2010
  20. @gitster

    Fix _XOPEN_SOURCE problem on DragonFly

    As on FreeBSD, defining _XOPEN_SOURCE to 600 on DragonFly BSD 2.4-RELEASE
    or later hides symbols from programs, which leads to implicit declaration
    of functions, making the return value to be assumed an int.  On architectures
    where sizeof(int) < sizeof(void *), this can cause unexpected behaviors or
    crashes.
    This change won't affect other OSes unless they define __DragonFly__ macro,
    or older versions of DragonFly BSD as the current git code doesn't rely on
    the features only available with _XOPEN_SOURCE set to 600 on DragonFly.
    
    Signed-off-by: YONETANI Tomokazu <y0netan1@dragonflybsd.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    YONETANI Tomokazu committed with gitster Apr 2, 2010
Commits on Apr 2, 2010
  1. @marcows @gitster

    builtin/commit: remove unnecessary variable definition

    The file descriptor is already defined at the beginning of the function.
    
    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    marcows committed with gitster Apr 2, 2010
  2. @marcows @gitster

    builtin/commit: fix duplicated sentence in a comment

    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    marcows committed with gitster Apr 2, 2010
  3. @eric-s-raymond @gitster

    Integrate version 3 ciabot scripts into contrib/.

    These have been extensively live-tested in the last week. The version 2
    ciabot.sh maintainer has passed the baton to me; ciabot.py is original.
    
    Signed-off-by: Eric S. Raymond <esr@thyrsus.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    eric-s-raymond committed with gitster Apr 2, 2010
  4. @gitster

    Makefile: update defaults for modern Cygwin

    Now that Cygwin 1.7.x has enabled lots of new features, and Cygwin 1.5
    is no longer actively supported by the Cygwin mailing lists, we might
    as well update the defaults to cater to those new features.
    
    NO_TRUSTABLE_FILEMODE is only necessary on FAT drives; the Cygwin
    community recommends NTFS drives, but there is still too much use
    for FAT to switch the default.  Likewise, UNRELIABLE_FSTAT is probably
    file-system specific, but worth keeping unchanged.
    
    This commit does not change the default for NO_MMAP, although definitive
    proof of whether this option is necessary is lacking.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Eric Blake committed with gitster Apr 1, 2010
Something went wrong with that request. Please try again.