Permalink
Commits on Feb 14, 2012
  1. Git 1.7.9.1

    gitster committed Feb 14, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jk/maint-tag-show-fixes' into maint

    gitster committed Feb 14, 2012
    * jk/maint-tag-show-fixes:
      tag: do not show non-tag contents with "-n"
      tag: die when listing missing or corrupt objects
      tag: fix output of "tag -n" when errors occur
    
    Conflicts:
    	t/t7004-tag.sh
  3. Merge branch 'bw/inet-pton-ntop-compat' into maint

    gitster committed Feb 14, 2012
    * bw/inet-pton-ntop-compat:
      Drop system includes from inet_pton/inet_ntop compatibility wrappers
  4. Merge branch 'mp/make-cleanse-x-for-exe' into maint

    gitster committed Feb 14, 2012
    * mp/make-cleanse-x-for-exe:
      Explicitly set X to avoid potential build breakage
  5. Merge branch 'jn/merge-no-edit-fix' into maint

    gitster committed Feb 14, 2012
    * jn/merge-no-edit-fix:
      merge: do not launch an editor on "--no-edit $tag"
Commits on Feb 13, 2012
  1. Update draft release notes to 1.7.9.1

    gitster committed Feb 13, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'js/add-e-submodule-fix' into maint

    gitster committed Feb 13, 2012
    * js/add-e-submodule-fix:
      add -e: do not show difference in a submodule that is merely dirty
  3. Merge branch 'jc/parse-date-raw' into maint

    gitster committed Feb 13, 2012
    * jc/parse-date-raw:
      parse_date(): '@' prefix forces git-timestamp
      parse_date(): allow ancient git-timestamp
  4. Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maint

    gitster committed Feb 13, 2012
    * jc/merge-ff-only-stronger-than-signed-merge:
      merge: do not create a signed tag merge under --ff-only option
  5. Merge branch 'jc/branch-desc-typoavoidance' into maint

    gitster committed Feb 13, 2012
    * jc/branch-desc-typoavoidance:
      branch --edit-description: protect against mistyped branch name
      tests: add write_script helper function
  6. Merge branch 'jn/rpm-spec' into maint

    gitster committed Feb 13, 2012
    * jn/rpm-spec:
      git.spec: Workaround localized messages not put in any RPM
  7. t: use sane_unset instead of unset

    avar authored and gitster committed Feb 12, 2012
    Change several tests to use the sane_unset function introduced in
    v1.7.3.1-35-g00648ba instead of the built-in unset function.
    
    This fixes a failure I was having on t9130-git-svn-authors-file.sh on
    Solaris, and prevents several other issues from occurring.
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. Remove Git's support for smoke testing

    avar authored and gitster committed Dec 23, 2011
    I'm no longer running the Git smoke testing service at
    smoke.git.nix.is due to Smolder being a fragile piece of software not
    having time to follow through on making it easy for third parties to
    run and submit their own smoke tests.
    
    So remove the support in Git for sending smoke tests to
    smoke.git.nix.is, it's still easy to modify the test suite to submit
    smokes somewhere else.
    
    This reverts the following commits:
    
        Revert "t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target" -- e38efac
        Revert "t/README: Document the Smoke testing" -- d15e9eb
        Revert "t/Makefile: Create test-results dir for smoke target" -- 617344d
        Revert "tests: Infrastructure for Git smoke testing" -- b6b84d1
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. Makefile: Change the default compiler from "gcc" to "cc"

    avar authored and gitster committed Dec 20, 2011
    Ever since the very first commit to git.git we've been setting CC to
    "gcc". Presumably this is behavior that Linus copied from the Linux
    Makefile.
    
    However unlike Linux Git is written in ANSI C and supports a multitude
    of compilers, including Clang, Sun Studio, xlc etc. On my Linux box
    "cc" is a symlink to clang, and on a Solaris box I have access to "cc"
    is Sun Studio's CC.
    
    Both of these are perfectly capable of compiling Git, and it's
    annoying to have to specify CC=cc on the command-line when compiling
    Git when that's the default behavior of most other portable programs.
    
    So change the default to "cc". Users who want to compile with GCC can
    still add "CC=gcc" to the make(1) command-line, but those users who
    don't have GCC as their "cc" will see expected behavior, and as a
    bonus we'll be more likely to smoke out new compilation warnings from
    our distributors since they'll me using a more varied set of compilers
    by default.
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 10, 2012
  1. Update draft release notes to 1.7.9.1

    gitster committed Feb 10, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jc/maint-request-pull-for-tag' into maint

    gitster committed Feb 10, 2012
    * jc/maint-request-pull-for-tag:
      request-pull: explicitly ask tags/$name to be pulled
  3. Merge branch 'tr/grep-l-with-decoration' into maint

    gitster committed Feb 10, 2012
    * tr/grep-l-with-decoration:
      grep: fix -l/-L interaction with decoration lines
  4. Merge branch 'jl/submodule-re-add' into maint

    gitster committed Feb 10, 2012
    * jl/submodule-re-add:
      submodule add: fix breakage when re-adding a deep submodule
  5. Merge branch 'da/maint-mergetool-twoway' into maint

    gitster committed Feb 10, 2012
    * da/maint-mergetool-twoway:
      mergetool: Provide an empty file when needed
Commits on Feb 9, 2012
  1. Explicitly set X to avoid potential build breakage

    Michael Palimaka authored and gitster committed Feb 8, 2012
    $X is appended to binary names for Windows builds (ie. git.exe).
    Pollution from the environment can inadvertently trigger this behaviour,
    resulting in 'git' turning into 'gitwhatever' without warning.
    
    Signed-off-by: Michael Palimaka <kensington@astralcloak.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. merge: do not launch an editor on "--no-edit $tag"

    gitster committed Feb 9, 2012
    When the user explicitly asked us not to, don't launch an editor.
    
    But do everything else the same way as the "edit" case, i.e. leave the
    comment with verification result in the log template and record the
    mergesig in the resulting merge commit for later inspection.
    
    Based on initiail analysis by Jonathan Nieder.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. tag: do not show non-tag contents with "-n"

    gitster committed Feb 6, 2012
    "git tag -n" did not check the type of the object it is reading the top n
    lines from. At least, avoid showing the beginning of trees and blobs when
    dealing with lightweight tags that point at them.
    
    As the payload of a tag and a commit look similar in that they both start
    with a header block, which is skipped for the purpose of "-n" output,
    followed by human readable text, allow the message of commit objects to be
    shown just like the contents of tag objects. This avoids regression for
    people who have been using "tag -n" to show the log messages of commits
    that are pointed at by lightweight tags.
    
    Test script is from Jeff King.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 7, 2012
  1. add -e: do not show difference in a submodule that is merely dirty

    dscho authored and gitster committed Feb 7, 2012
    When the HEAD of the submodule matches what is recorded in the index of
    the superproject, and it has local changes or untracked files, the patch
    offered by "git add -e" for editing shows a diff like this:
    
        diff --git a/submodule b/submodule
        <header>
        -deadbeef...
        +deadbeef...-dirty
    
    Because applying such a patch has no effect to the index, this is a
    useless noise.  Generate the patch with IGNORE_DIRTY_SUBMODULES flag to
    prevent such a change from getting reported.
    
    This patch also loses the "-dirty" suffix from the output when the HEAD of
    the submodule is different from what is in the index of the superproject.
    As such dirtiness expressed by the suffix does not affect the result of
    the patch application at all, there is no information lost if we remove
    it. The user could still run "git status" before "git add -e" if s/he
    cares about the dirtiness.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 6, 2012
  1. tag: die when listing missing or corrupt objects

    peff authored and gitster committed Feb 6, 2012
    We don't usually bother looking at tagged objects at all
    when listing. However, if "-n" is specified, we open the
    objects to read the annotations of the tags.  If we fail to
    read an object, or if the object has zero length, we simply
    silently return.
    
    The first case is an indication of a broken or corrupt repo,
    and we should notify the user of the error.
    
    The second case is OK to silently ignore; however, the
    existing code leaked the buffer returned by read_sha1_file.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. tag: fix output of "tag -n" when errors occur

    peff authored and gitster committed Feb 6, 2012
    When "git tag" is instructed to print lines from annotated
    tags via "-n", it first prints the tag name, then attempts
    to parse and print the lines of the tag object, and then
    finally adds a trailing newline.
    
    If an error occurs, we return early from the function and
    never print the newline, screwing up the output for the next
    tag. Let's factor the line-printing into its own function so
    we can manage the early returns better, and make sure that
    we always terminate the line.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Prepare for 1.7.9.1

    gitster committed Feb 6, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. completion: --edit and --no-edit for git-merge

    awde authored and gitster committed Jan 30, 2012
    Signed-off-by: Adrian Weimann <adrian.weimann@googlemail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Merge branch 'sp/smart-http-failure-to-push' into maint

    gitster committed Feb 6, 2012
    * sp/smart-http-failure-to-push:
      remote-curl: Fix push status report when all branches fail
  6. Merge branch 'jc/maint-log-first-parent-pathspec' into maint

    gitster committed Feb 6, 2012
    * jc/maint-log-first-parent-pathspec:
      Making pathspec limited log play nicer with --first-parent
  7. Merge branch 'cb/push-quiet' into maint

    gitster committed Feb 6, 2012
    * cb/push-quiet:
      t5541: avoid TAP test miscounting
      fix push --quiet: add 'quiet' capability to receive-pack
      server_supports(): parse feature list more carefully
  8. Merge branch 'cb/maint-kill-subprocess-upon-signal' into maint

    gitster committed Feb 6, 2012
    * cb/maint-kill-subprocess-upon-signal:
      dashed externals: kill children on exit
      run-command: optionally kill children on exit
  9. Sync with 1.7.6.6

    gitster committed Feb 6, 2012
    * maint-1.7.8:
      Git 1.7.6.6
      imap-send: remove dead code
  10. Sync with 1.7.6.6

    gitster committed Feb 6, 2012
    * maint-1.7.7:
      Git 1.7.6.6
      imap-send: remove dead code
  11. Sync with 1.7.6.6

    gitster committed Feb 6, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. Git 1.7.6.6

    gitster committed Feb 6, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>