Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v1.6.4.2

Aug 29, 2009

  1. Junio C Hamano

    GIT 1.6.4.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 29, 2009
  2. Remove unused t/t8005/iso8859-5.txt

    This file is no longer used since 54bc13c (t8005: Nobody writes Russian in
    shift_jis, 2009-06-18).
    
    Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 29, 2009 gitster committed August 29, 2009
  3. Junio C Hamano

    Merge branch 'rc/maint-http-fix' into maint

    * rc/maint-http-fix:
      http.c: don't assume that urls don't end with slash
    authored August 28, 2009
  4. Tay Ray Chuan

    http.c: set slot callback members to NULL when releasing object

    Set the members callback_func and callback_data of freq->slot to NULL
    when releasing a http_object_request. release_active_slot() is also
    invoked on the slot to remove the curl handle associated with the slot
    from the multi stack (CURLM *curlm in http.c).
    
    These prevent the callback function and data from being used in http
    methods (like http.c::finish_active_slot()) after a
    http_object_request has been free'd.
    
    Noticed by Ali Polatel, who later tested this patch to verify that it
    fixes the problem he saw; Dscho helped to identify the problem spot.
    
    Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 26, 2009 gitster committed August 28, 2009

Aug 28, 2009

  1. Junio C Hamano

    Merge branch 'maint-1.6.3' into maint

    * maint-1.6.3:
      Fix overridable written with an extra 'e'
      Documentation: git-archive: mark --format as optional in summary
      Round-down years in "years+months" relative date view
    authored August 27, 2009
  2. Junio C Hamano

    Merge branch 'maint-1.6.2' into maint-1.6.3

    * maint-1.6.2:
      Fix overridable written with an extra 'e'
      Documentation: git-archive: mark --format as optional in summary
      Round-down years in "years+months" relative date view
    
    Conflicts:
    	Documentation/git-archive.txt
    authored August 27, 2009
  3. Fix overridable written with an extra 'e'

    Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 28, 2009 gitster committed August 27, 2009
  4. Junio C Hamano

    Merge branch 'maint-1.6.1' into maint-1.6.2

    * maint-1.6.1:
      Documentation: git-archive: mark --format as optional in summary
    authored August 27, 2009
  5. Junio C Hamano

    Merge branch 'maint-1.6.0' into maint-1.6.1

    * maint-1.6.0:
      Documentation: git-archive: mark --format as optional in summary
    authored August 27, 2009
  6. Wesley J. Landaker

    Documentation: git-archive: mark --format as optional in summary

    The --format option was made optional in 8ff21b1 (git-archive: make
    tar the default format, 2007-04-09), but it was not marked as optional
    in the summary. This trival patch just changes the summary to match
    the rest of the documentation.
    
    Signed-off-by: Wesley J. Landaker <wjl@icecavern.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 27, 2009 gitster committed August 27, 2009
  7. Junio C Hamano

    Merge branch 'maint-1.5.6' into maint-1.6.0

    * maint-1.5.6:
      revision traversal and pack: notice and die on missing commit
    authored August 27, 2009
  8. Round-down years in "years+months" relative date view

    Previously, a commit from 1 year and 7 months ago would display as
    "2 years, 7 months ago".
    
    Signed-off-by: David Reiss <dreiss@facebook.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 27, 2009 gitster committed August 27, 2009

Aug 26, 2009

  1. git-log: allow --decorate[=short|full]

    Commit de435ac changed the behavior of --decorate from printing the
    full ref (e.g., "refs/heads/master") to a shorter, more human-readable
    version (e.g., just "master"). While this is nice for human readers,
    external tools using the output from "git log" may prefer the full
    version.
    
    This patch introduces an extension to --decorate to allow the caller to
    specify either the short or the full versions.
    
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
    Acked-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 15, 2009 gitster committed August 26, 2009
  2. David Kågedal

    Minor improvement to the write-tree documentation

    Signed-off-by: David Kågedal <davidk@lysator.liu.se>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 26, 2009 gitster committed August 26, 2009
  3. git-bisect: call the found commit "*the* first bad commit"

    Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 26, 2009 gitster committed August 26, 2009
  4. Junio C Hamano

    Merge branch 'js/maint-cover-letter-non-ascii' into maint

    * js/maint-cover-letter-non-ascii:
      Correctly mark cover letters' encodings if they are not pure ASCII
      Expose the has_non_ascii() function
    authored August 26, 2009
  5. Junio C Hamano

    Merge branch 'jc/maint-clean-nested-dir-safety' into maint

    * jc/maint-clean-nested-dir-safety:
      clean: require double -f options to nuke nested git repository and work tree
    authored August 26, 2009
  6. Junio C Hamano

    Merge branch 'jk/maint-merge-msg-fix' into maint

    * jk/maint-merge-msg-fix:
      merge: indicate remote tracking branches in merge message
      merge: fix incorrect merge message for ambiguous tag/branch
      add tests for merge message headings
    authored August 26, 2009
  7. Junio C Hamano

    Merge branch 'jc/apply-epoch-patch' into maint

    * jc/apply-epoch-patch:
      apply: notice creation/removal patches produced by GNU diff
    authored August 26, 2009
  8. Junio C Hamano

    Merge branch 'jp/symlink-dirs' into maint

    * jp/symlink-dirs:
      t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite
      git-checkout: be careful about untracked symlinks
      lstat_cache: guard against full match of length of 'name' parameter
      Demonstrate bugs when a directory is replaced with a symlink
    authored August 26, 2009
  9. Junio C Hamano

    Merge branch 'maint-1.6.3' into maint

    * maint-1.6.3:
      add -p: do not attempt to coalesce mode changes
      git add -p: demonstrate failure when staging both mode and hunk
    authored August 26, 2009
  10. Junio C Hamano

    Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into maint-1.6.3

    * tr/maint-1.6.3-add-p-modeonly-fix:
      add -p: do not attempt to coalesce mode changes
      git add -p: demonstrate failure when staging both mode and hunk
    authored August 26, 2009

Aug 22, 2009

  1. Junio C Hamano

    GIT 1.6.4.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 21, 2009
  2. Junio C Hamano

    Merge branch 'bc/maint-am-email' into maint

    * bc/maint-am-email:
      git-am: print fair error message when format detection fails
      am: allow individual e-mail files as input
    authored August 21, 2009

Aug 21, 2009

  1. Junio C Hamano

    Merge branch 'jc/maint-merge-recursive-fix' into maint

    * jc/maint-merge-recursive-fix:
      merge-recursive: don't segfault while handling rename clashes
    authored August 21, 2009
  2. Junio C Hamano

    Merge branch 'zf/maint-gitweb-acname' into maint

    * zf/maint-gitweb-acname:
      gitweb: parse_commit_text encoding fix
    authored August 21, 2009
  3. Junio C Hamano

    Merge branch 'np/maint-limit-delta-cache' into maint

    * np/maint-limit-delta-cache:
      don't let the delta cache grow unbounded in 'git repack'
    authored August 21, 2009
  4. Junio C Hamano

    Merge branch 'jk/maint-show-tag' into maint

    * jk/maint-show-tag:
      show: add space between multiple items
      show: suppress extra newline when showing annotated tag
    authored August 21, 2009
  5. Junio C Hamano

    Merge branch 'sb/maint-pull-rebase' into maint

    * sb/maint-pull-rebase:
      pull: support rebased upstream + fetch + pull --rebase
      t5520-pull: Test for rebased upstream + fetch + pull --rebase
    authored August 21, 2009

Aug 18, 2009

  1. Tay Ray Chuan

    http.c: don't assume that urls don't end with slash

    Make append_remote_object_url() (and by implication,
    get_remote_object_url) use end_url_with_slash() to ensure that the url
    ends with a slash.
    
    Previously, they assumed that the url did not end with a slash and
    as a result appended a slash, sometimes errorneously.
    
    This fixes an issue introduced in 5424bc5 ("http*: add helper methods
    for fetching objects (loose)"), where the append_remote_object_url()
    implementation in http-push.c, which assumed that urls end with a
    slash, was replaced by another one in http.c, which assumed urls did
    not end with a slash.
    
    The above issue was raised by Thomas Schlichter:
    
      http://marc.info/?l=git&m=125043105231327
    
    Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
    Tested-by: Thomas Schlichter <thomas.schlichter@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 17, 2009 gitster committed August 18, 2009
  2. Matthieu Moy

    filter-branch: make the usage string fit on 80 chars terminals.

    It used to be a single, huge line, badly wrapped by xterm.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 18, 2009 gitster committed August 18, 2009
  3. dscho

    filter-branch: add an example how to add ACKs to a range of commits

    When you have to add certain lines like ACKs (or for that matter,
    Signed-off-by:s) to a range of commits starting with HEAD, you might
    be tempted to use 'git rebase -i -10', but that is a waste of your
    time.
    
    It is better to use 'git filter-branch' with an appropriate message
    filter, and this commit adds an example how to do so to
    filter-branch's man page.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 17, 2009 gitster committed August 18, 2009

Aug 17, 2009

  1. Jeff King

    docs: describe impact of repack on "clone -s"

    The effects of repacking on a repository with alternates are a bit
    subtle. The two main things users will want are:
    
      1. Not to waste disk space by accidentally copying objects which could
         be shared.
    
      2. Copying all objects explicitly to break the dependency on the source
         repo.
    
    This patch describes both under the "clone -s" documentation. It makes
    sense to put it there rather than in git-repack.txt for both cases.
    
    For (1), we are warning the user who is using "clone -s" about what _not_
    to do, so we need to get their attention when reading about "clone -s".
    
    For (2), we are telling them how git-repack can be used to accomplish a
    task, but until they know that git-repack is the right tool, they have no
    reason to look at the repack documentation.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 17, 2009 gitster committed August 17, 2009

Aug 15, 2009

  1. trast

    add -p: do not attempt to coalesce mode changes

    In 0392513 (add-interactive: refactor mode hunk handling, 2009-04-16),
    we merged the interaction loops for mode changes and hunk staging.
    This was fine at the time, because 0beee4c (git-add--interactive:
    remove hunk coalescing, 2008-07-02) removed hunk coalescing.
    
    However, in 7a26e65 (Revert "git-add--interactive: remove hunk
    coalescing", 2009-05-16), we resurrected it.  Since then, the code
    would attempt in vain to merge mode changes with diff hunks,
    corrupting both in the process.
    
    We add a check to the coalescing loop to ensure it only looks at diff
    hunks, thus skipping mode changes.
    
    Noticed-by: Kirill Smelkov <kirr@mns.spb.ru>
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 15, 2009 gitster committed August 15, 2009
  2. git add -p: demonstrate failure when staging both mode and hunk

    When trying to stage changes to file which has also pending `chmod +x`,
    `git add -p` produces lots of 'Use of uninitialized value ...' warnings
    and fails to do the job:
    
        $ echo content >> file
        $ chmod +x file
        $ git add -p
        diff --git a/file b/file
        index e69de29..d95f3ad
        --- a/file
        +++ b/file
        old mode 100644
        new mode 100755
        Stage mode change [y,n,q,a,d,/,j,J,g,?]? y
        @@ -0,0 +1 @@
        +content
        Stage this hunk [y,n,q,a,d,/,K,g,e,?]? y
        Use of uninitialized value $o_ofs in addition (+) at .../git-add--interactive line 776.
        Use of uninitialized value $ofs in numeric le (<=) at .../git-add--interactive line 806.
        Use of uninitialized value $o0_ofs in concatenation (.) or string at .../git-add--interactive line 830.
        Use of uninitialized value $n0_ofs in concatenation (.) or string at .../git-add--interactive line 830.
        Use of uninitialized value $o_ofs in addition (+) at .../git-add--interactive line 776.
        fatal: corrupt patch at line 5
        diff --git a/file b/file
        index e69de29..d95f3ad
        --- a/file
        +++ b/file
        @@ -,0 + @@
        +content
    
    Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 15, 2009 gitster committed August 15, 2009
Something went wrong with that request. Please try again.