Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v1.8.0.2

Dec 10, 2012

  1. Junio C Hamano

    Git 1.8.0.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored December 10, 2012
  2. Sebastien Loriot

    Documentation/git-stash.txt: add a missing verb

    Signed-off-by: Sébastien Loriot <sloriot.ml@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored December 10, 2012 gitster committed December 10, 2012

Dec 09, 2012

  1. Junio C Hamano

    git(1): remove a defunct link to "list of authors"

    The linked page has not been showing the promised "more complete
    list" for more than 6 months by now, and nobody has resurrected
    the list there nor elsewhere since then.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored December 07, 2012

Dec 07, 2012

  1. Junio C Hamano

    Update draft release notes to 1.8.0.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored December 07, 2012
  2. Junio C Hamano

    Merge branch 'jc/doc-push-satellite' into maint

    * jc/doc-push-satellite:
      Documentation/git-push.txt: clarify the "push from satellite" workflow
    authored December 07, 2012
  3. Junio C Hamano

    Merge branch 'jc/same-encoding' into maint

    Various codepaths checked if two encoding names are the same using
    ad-hoc code and some of them ended up asking iconv() to convert
    between "utf8" and "UTF-8".  The former is not a valid way to spell
    the encoding name, but often people use it by mistake, and we
    equated them in some but not all codepaths. Introduce a new helper
    function to make these codepaths consistent.
    
    * jc/same-encoding:
      reencode_string(): introduce and use same_encoding()
    authored December 07, 2012
  4. Junio C Hamano

    Merge branch 'lt/diff-stat-show-0-lines' into maint

    "git diff --stat" miscounted the total number of changed lines when
    binary files were involved and hidden beyond --stat-count.  It also
    miscounted the total number of changed files when there were
    unmerged paths.
    
    * lt/diff-stat-show-0-lines:
      t4049: refocus tests
      diff --shortstat: do not count "unmerged" entries
      diff --stat: do not count "unmerged" entries
      diff --stat: move the "total count" logic to the last loop
      diff --stat: use "file" temporary variable to refer to data->files[i]
      diff --stat: status of unmodified pair in diff-q is not zero
      test: add failing tests for "diff --stat" to t4049
      Fix "git diff --stat" for interesting - but empty - file changes
    authored December 07, 2012

Nov 29, 2012

  1. Matthieu Moy

    git-fast-import.txt: improve documentation for quoted paths

    The documentation mentioned only newlines and double quotes as
    characters needing escaping, but the backslash also needs it. Also, the
    documentation was not clearly saying that double quotes around the file
    name were required (double quotes in the examples could be interpreted as
    part of the sentence, not part of the actual string).
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 29, 2012 gitster committed November 29, 2012
  2. Matthieu Moy

    git-remote-mediawiki: escape ", \, and LF in file names

    A mediawiki page can contain, and even start with a " character, we have
    to escape it when generating the fast-export stream, as well as \
    character. While we're there, also escape newlines, but I don't think we
    can get them from MediaWiki pages.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 29, 2012 gitster committed November 29, 2012
  3. Junio C Hamano

    t4049: refocus tests

    The primary thing Linus's patch wanted to change was to make sure
    that 0-line change appears for a mode-only change.  Update the
    first test to chmod a file that we can see in the output (limited
    by --stat-count) to demonstrate it.  Also make sure to use test_chmod
    and compare the index and the tree, so that we can run this test
    even on a filesystem without permission bits.
    
    Later two tests are about fixes to separate issues that were
    introduced and/or uncovered by Linus's patch as a side effect, but
    the issues are not related to mode-only changes.  Remove chmod from
    the tests.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 29, 2012

Nov 28, 2012

  1. Junio C Hamano

    Start preparing for 1.8.0.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 28, 2012
  2. Junio C Hamano

    Merge branch 'rh/maint-gitweb-highlight-ext' into maint

    Syntax highlighting in "gitweb" was not quite working.
    
    * rh/maint-gitweb-highlight-ext:
      gitweb.perl: fix %highlight_ext mappings
    authored November 28, 2012
  3. Junio C Hamano

    Merge branch 'pw/maint-p4-rcs-expansion-newline' into maint

    "git p4" used to try expanding malformed "$keyword$" that spans
    across multiple lines.
    
    * pw/maint-p4-rcs-expansion-newline:
      git p4: RCS expansion should not span newlines
    authored November 28, 2012
  4. completion: add options --single-branch and --branch to "git clone"

    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 28, 2012 gitster committed November 28, 2012
  5. Junio C Hamano

    Documentation/git-push.txt: clarify the "push from satellite" workflow

    The context of the example to push into refs/remotes/satellite/
    hierarchy of the other repository needs to be spelled out explicitly
    for the value of this example to be fully appreciated.  Make it so.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 27, 2012

Nov 27, 2012

  1. Junio C Hamano

    diff --shortstat: do not count "unmerged" entries

    Fix the same issue as the previous one for "git diff --stat";
    unmerged entries was doubly-counted.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 27, 2012
  2. Junio C Hamano

    Merge branch 'nd/maint-compat-fnmatch-fix' into maint

    * nd/maint-compat-fnmatch-fix:
      compat/fnmatch: fix off-by-one character class's length check
    authored November 27, 2012
  3. Junio C Hamano

    Merge branch 'jh/update-ref-d-through-symref' into maint

    * jh/update-ref-d-through-symref:
      Fix failure to delete a packed ref through a symref
      t1400-update-ref: Add test verifying bug with symrefs in delete_ref()
    authored November 27, 2012
  4. Junio C Hamano

    Merge branch 'esr/maint-doc-fast-import' into maint

    * esr/maint-doc-fast-import:
      doc/fast-import: clarify how content states are built
    authored November 27, 2012
  5. Junio C Hamano

    Merge branch 'wtk/submodule-doc-fixup' into maint

    * wtk/submodule-doc-fixup:
      git-submodule: wrap branch option with "<>" in usage strings.
    authored November 27, 2012
  6. Junio C Hamano

    diff --stat: do not count "unmerged" entries

    Even though we show a separate *UNMERGED* entry in the patch and
    diffstat output (or in the --raw format, for that matter) in
    addition to and separately from the diff against the specified stage
    (defaulting to #2) for unmerged paths, they should not be counted in
    the total number of files affected---that would lead to counting the
    same path twice.
    
    The separation done by the previous step makes this fix simple and
    straightforward.  Among the filepairs in diff_queue, paths that
    weren't modified, and the extra "unmerged" entries do not count as
    total number of files.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 27, 2012
  7. Junio C Hamano

    diff --stat: move the "total count" logic to the last loop

    The diffstat generation logic, with --stat-count limit, is
    implemented as three loops.
    
     - The first counts the width necessary to show stats up to
       specified number of entries, and notes up to how many entries in
       the data we need to iterate to show the graph;
    
     - The second iterates that many times to draw the graph, adjusts
       the number of "total modified files", and counts the total
       added/deleted lines for the part that was shown in the graph;
    
     - The third iterates over the remainder and only does the part to
       count "total added/deleted lines" and to adjust "total modified
       files" without drawing anything.
    
    Move the logic to count added/deleted lines and modified files from
    the second loop to the third loop.
    
    This incidentally fixes a bug.  The third loop was not filtering
    binary changes (counted in bytes) from the total added/deleted as it
    should.  The second loop implemented this correctly, so if a binary
    change appeared earlier than the --stat-count cutoff, the code
    counted number of added/deleted lines correctly, but if it appeared
    beyond the cutoff, the number of lines would have mixed with the
    byte count in the buggy third loop.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 27, 2012
  8. Junio C Hamano

    diff --stat: use "file" temporary variable to refer to data->files[i]

    The generated code shouldn't change but it is easier to read.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 27, 2012
  9. Junio C Hamano

    diff --stat: status of unmodified pair in diff-q is not zero

    It is spelled DIFF_STATUS_UNKNOWN these days, and is different from zero.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 27, 2012
  10. Junio C Hamano

    test: add failing tests for "diff --stat" to t4049

    There are a few problems in diff.c around --stat area, partially
    caused by the recent 74faaa1 (Fix "git diff --stat" for interesting
    - but empty - file changes, 2012-10-17), and largely caused by the
    earlier change that introduced when --stat-count was added.
    
    Add a few test pieces to t4049 to expose the issues.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 27, 2012
  11. Mark Szepieniec

    Documentation: improve phrasing in git-push.txt

    The current version contains the sentence:
    
    Further suppose that the other person already pushed changes leading to
    A back to the original repository you two obtained the original commit
    X.
    
    which doesn't parse for me; I've changed it to
    
    Further suppose that the other person already pushed changes leading to
    A back to the original repository from which you two obtained the
    original commit X.
    
    Signed-off-by: Mark Szepieniec <mszepien@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 27, 2012 gitster committed November 27, 2012

Nov 26, 2012

  1. Antoine Pelisse

    Fix typo in remote set-head usage

    parenthesis are not matching in `builtin_remote_sethead_usage`
    as a square bracket is closing something never opened.
    
    Signed-off-by: Antoine Pelisse <apelisse@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 26, 2012 gitster committed November 26, 2012
  2. Makefile: hide stderr of curl-config test

    You will get
    
        $ make distclean 2>&1 | grep curl
        /bin/sh: curl-config: not found
        /bin/sh: curl-config: not found
        /bin/sh: curl-config: not found
        /bin/sh: curl-config: not found
        /bin/sh: curl-config: not found
        $
    
    if you don't have a curl development package installed.
    
    The intent is not to alarm the user, but just to test if there is
    a new enough curl installed.  However, if you look at search engine
    suggested completions, the above "error" messages are confusing
    people into thinking curl is a hard requirement.
    
    Redirect this error output to /dev/null as it is not necessary to be
    shown to the end users.
    
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 21, 2012 gitster committed November 26, 2012
  3. Junio C Hamano

    Git 1.8.0.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 25, 2012
  4. Junio C Hamano

    Merge branch 'jk/checkout-out-of-unborn' into maint

    * jk/checkout-out-of-unborn:
      checkout: print a message when switching unborn branches
    authored November 25, 2012
  5. Junio C Hamano

    Merge branch 'cn/config-missing-path' into maint

    * cn/config-missing-path:
      config: don't segfault when given --path with a missing value
    authored November 25, 2012
  6. Junio C Hamano

    Merge branch 'jk/maint-gitweb-xss' into maint

    Fixes an XSS vulnerability in gitweb.
    
    * jk/maint-gitweb-xss:
      gitweb: escape html in rss title
    authored November 25, 2012

Nov 25, 2012

  1. Marc Khouzam

    Completion must sort before using uniq

    The user can be presented with invalid completion results
    when trying to complete a 'git checkout' command.  This can happen
    when using a branch name prefix that matches multiple remote branches.
    
    For example, if available branches are:
      master
      remotes/GitHub/maint
      remotes/GitHub/master
      remotes/origin/maint
      remotes/origin/master
    
    When performing completion on 'git checkout ma' the user will be
    given the choices:
      maint
      master
    
    However, 'git checkout maint' will fail in this case, although
    completion previously said 'maint' was valid.  Furthermore, when
    performing completion on 'git checkout mai', no choices will be
    suggested.  So, the user is first told that the branch name
    'maint' is valid, but when trying to complete 'mai' into 'maint',
    that completion is no longer valid.
    
    The completion results should never propose 'maint' as a valid
    branch name, since 'git checkout' will refuse it.
    
    The reason for this bug is that the uniq program only
    works with sorted input.  The man page states
    "uniq prints the unique lines in a sorted file".
    
    When __git_refs uses the guess heuristic employed by checkout for
    tracking branches it wants to consider remote branches but only if
    the branch name is unique.  To do that, it calls 'uniq -u'.  However
    the input given to 'uniq -u' is not sorted.
    
    Therefore, in the above example, when dealing with 'git checkout ma',
    "__git_refs '' 1" will find the following list:
      master
      maint
      master
      maint
      master
    
    which, when passed to 'uniq -u' will remain the same.  Therefore
    'maint' will be wrongly suggested as a valid option.
    
    When dealing with 'git checkout mai', the list will be:
      maint
      maint
    
    which happens to be sorted and will be emptied by 'uniq -u',
    properly ignoring 'maint'.
    
    A solution for preventing the completion script from suggesting
    such invalid branch names is to first call 'sort' and then 'uniq -u'.
    
    Signed-off-by: Marc Khouzam <marc.khouzam@gmail.com>
    Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 23, 2012 gitster committed November 24, 2012

Nov 20, 2012

  1. Nguyễn Thái Ngọc Duy

    compat/fnmatch: fix off-by-one character class's length check

    Character class "xdigit" is the only one that hits 6 character limit
    defined by CHAR_CLASS_MAX_LENGTH. All other character classes are 5
    character long and therefore never caught by this.
    
    This should make xdigit tests in t3070 pass on Windows.
    
    Reported-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 11, 2012 gitster committed November 20, 2012
  2. Junio C Hamano

    Further preparation for 1.8.0.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored November 20, 2012
Something went wrong with that request. Please try again.