Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 13, 2008
  1. @gitster

    GIT 1.6.0-rc3

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

    Merge branch 'maint'

    gitster authored
    * maint:
      Do not talk about "diff" in rev-list documentation.
  3. @gitster

    Do not talk about "diff" in rev-list documentation.

    gitster authored
    Since 8c02eee (git-rev-list(1): group options; reformat; document more
    options, 2006-09-01), git-rev-list documentation talks as if it supports
    any kind of diff output.  It doesn't.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Merge git://git.bogomips.org/git-svn

    gitster authored
    * git://git.bogomips.org/git-svn:
      git-svn: Reduce temp file usage when dealing with non-links
      git-svn: Make it incrementally faster by minimizing temp files
      Git.pm: Add faculties to allow temp files to be cached
  5. @neoeinstein

    git-svn: Reduce temp file usage when dealing with non-links

    neoeinstein authored Eric Wong committed
    Currently, in sub 'close_file', git-svn creates a temporary file and
    copies the contents of the blob to be written into it. This is useful
    for symlinks because svn stores symlinks in the form:
    
    link $FILE_PATH
    
    Git creates a blob only out of '$FILE_PATH' and uses file mode to
    indicate that the blob should be interpreted as a symlink.
    
    As git-hash-object is invoked with --stdin-paths, a duplicate of the
    link from svn must be created that leaves off the first five bytes,
    i.e. 'link '. However, this is wholly unnecessary for normal blobs,
    though, as we already have a temp file with their contents. Copying
    the entire file gains nothing, and effectively requires a file to be
    written twice before making it into the object db.
    
    This patch corrects that issue, holding onto the substr-like
    duplication for symlinks, but skipping it altogether for normal blobs
    by reusing the existing temp file.
    
    Signed-off-by: Marcus Griep <marcus@griep.us>
    Acked-by: Eric Wong <normalperson@yhbt.net>
  6. @neoeinstein

    git-svn: Make it incrementally faster by minimizing temp files

    neoeinstein authored Eric Wong committed
    Currently, git-svn would create a temp file on four occasions:
    1. Reading a blob out of the object db
    2. Creating a delta from svn
    3. Hashing and writing a blob into the object db
    4. Reading a blob out of the object db (in another place in code)
    
    Any time git-svn did the above, it would dutifully create and then
    delete said temp file.  Unfortunately, this means that between 2-4
    temporary files are created/deleted per file 'add/modify'-ed in
    svn (O(n)).  This causes significant overhead and helps the inode
    counter to spin beautifully.
    
    By its nature, git-svn is a serial beast.  Thus, reusing a temp file
    does not pose significant problems.  "truncate and seek" takes much
    less time than "unlink and create".  This patch centralizes the
    tempfile creation and holds onto the tempfile until they are deleted
    on exit.  This significantly reduces file overhead, now requiring
    at most three (3) temp files per run (O(1)).
    
    Signed-off-by: Marcus Griep <marcus@griep.us>
    Acked-by: Eric Wong <normalperson@yhbt.net>
  7. @neoeinstein

    Git.pm: Add faculties to allow temp files to be cached

    neoeinstein authored Eric Wong committed
    This patch offers a generic interface to allow temp files to be
    cached while using an instance of the 'Git' package. If many
    temp files are created and destroyed during the execution of a
    program, this caching mechanism can help reduce the amount of
    files created and destroyed by the filesystem.
    
    The temp_acquire method provides a weak guarantee that a temp
    file will not be stolen by subsequent requests. If a file is
    locked when another acquire request is made, a simple error is
    thrown.
    
    Signed-off-by: Marcus Griep <marcus@griep.us>
    Acked-by: Eric Wong <normalperson@yhbt.net>
  8. @trast @gitster

    Documentation: rev-list-options: Rewrite simplification descriptions …

    trast authored gitster committed
    …for clarity
    
    This completely rewrites the documentation of --full-history with lots
    of examples.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 12, 2008
  1. @hendeby @gitster

    Teach git diff about BibTeX head hunk patterns

    hendeby authored gitster committed
    All BibTeX entries starts with an @ followed by an entry type.  Since
    there are many entry types and own can be defined, the pattern matches
    legal entry type names instead of just the default types (which would
    be a long list).  The pattern also matches strings and comments since
    they will also be useful to position oneself in a bib-file.
    
    Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @hendeby @gitster

    gitattributes: Document built in hunk header patterns

    hendeby authored gitster committed
    Since the hunk header pattern text was written patterns for Ruby and
    Pascal/Delphi have been added.  For users to be able to find them they
    should be documented not only in code.
    
    Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @BuGlessRB @gitster

    git-daemon: SysV needs the signal handler reinstated.

    BuGlessRB authored gitster committed
    Fixes the bug on (amongst others) Solaris that only the first
    child ever is reaped.
    
    Signed-off-by: Stephen R. van den Berg <srb@cuci.nl>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    diff --check: do not unconditionally complain about trailing empty lines

    gitster authored
    Recently "git diff --check" learned to detect new trailing blank lines
    just like "git apply --whitespace" does.  However this check should not
    trigger unconditionally.  This patch makes it honor the whitespace
    settings from core.whitespace and gitattributes.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      git-bisect: fix wrong usage of read(1)
  6. @trast @gitster

    Documentation: rev-list-options: Fix a typo

    trast authored gitster committed
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @gitster

    Adjust for the new way of enabling the default post-update hook

    Petr Baudis authored gitster committed
    The post-update hook, which is required to be enabled in order for
    the repository to be accessible over HTTP, is not enabled by
    chmod a+x anymore, but instead by dropping the .sample suffix.
    
    This patch emphasizes this change in the release notes (since
    I believe this is rather noticeable backwards-incompatible change).
    It also adjusts the documentation which still described the old way
    and fixes t/t5540-http-push.sh, which was broken for 1.5 month
    but apparently noone ever runs this test.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 11, 2008
  1. @fmoreau @gitster

    git-bisect: fix wrong usage of read(1)

    fmoreau authored gitster committed
    Signed-off-by:  Francis Moreau <francis.moro@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @pclouds @gitster

    Fix typo in comments of longest_ancestor_length()

    pclouds authored gitster committed
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      Re-fix rev-list-options documentation
  4. @gitster

    Re-fix rev-list-options documentation

    gitster authored
    18a2197 (Documentation: rev-list-options: Fix -g paragraph formatting,
    2008-08-10) introduced the third paragraph that is continued, but it seems
    to confuse docbook toolchain on FC9 machines.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      Documentation: fix invalid reference to 'mybranch' in user manual
      Fix deleting reflog entries from HEAD reflog
      reflog test: add more tests for 'reflog delete'
      Documentation: rev-list-options: Fix -g paragraph formatting
    
    Conflicts:
    	Documentation/user-manual.txt
  6. @istankovic @gitster

    Documentation: fix invalid reference to 'mybranch' in user manual

    istankovic authored gitster committed
    Signed-off-by: Ivan Stankovic <pokemon@fly.srk.fer.hr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @gitster

    Fix deleting reflog entries from HEAD reflog

    gitster authored
    dwim_ref() used to resolve HEAD symbolic ref to its target (i.e. current
    branch).  This incorrectly removed the reflog entry from the current
    branch when 'git reflog delete HEAD@{1}' was asked for.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. @pieter @gitster

    reflog test: add more tests for 'reflog delete'

    pieter authored gitster committed
    This adds more tests for 'reflog delete' and marks it as
    broken, as currently a call to 'git reflog delete HEAD@{1}'
    deletes entries in the currently checked out branch's log,
    not the HEAD log.
    
    Noticed by John Wiegley
    
    Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. @trast @gitster

    Documentation: rev-list-options: Fix -g paragraph formatting

    trast authored gitster committed
    - Add an escape to @{now}.  Without the escape, the brace does
      something magic and eats half the sentence up to the closing brace
      at 'timestamp}'.
    
    - Join the last paragraph with a '+'.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 9, 2008
  1. @gitster

    Update draft RelNotes for 1.6.0

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

    Merge branch 'maint'

    gitster authored
    * maint:
      asciidoc markup fixes
      Fail properly when cloning from invalid HTTP URL
    
    Conflicts:
    	Documentation/git-push.txt
  3. @gitster

    mailinfo: fix MIME multi-part message boundary handling

    gitster authored
    After finding a MIME multi-part message boundary line, the handle_body()
    function is supposed to first flush any accumulated contents from the
    previous part to the output stream.  However, the code mistakenly output
    the boundary line it found.
    
    The old code that used one global, fixed-length buffer line[] used an
    alternate static buffer newline[] for keeping track of this accumulated
    contents and flushed newline[] upon seeing the boundary; when 3b6121f
    (git-mailinfo: use strbuf's instead of fixed buffers, 2008-07-13)
    converted a fixed-length buffer in this program to use strbuf,these two
    buffers were converted to "line" and "prev" (the latter of which now has a
    much more sensible name) strbufs, but the code mistakenly flushed "line"
    (which contains the boundary we have just found), instead of "prev".
    
    This resulted in the first boundary to be output in front of the first
    line of the message.
    
    The rewritten implementation of handle_boundary() lost the terminating
    newline; this would then result in the second line of the message to be
    stuck with the first line.
    
    The is_multipart_boundary() was designed to catch both the internal
    boundary and the terminating one (the one with trailing "--"); this also
    was broken with the rewrite, and the code in the handle_boundary() to
    handle the terminating boundary was never triggered.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @pieter @gitster

    builtin-rm: Add a --force flag

    pieter authored gitster committed
    This adds a --force flag to git-rm, making it somewhat easier for
    subversion people to switch.
    
    Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 8, 2008
  1. @gitster

    git-svn: wrap long lines in a few places

    Eric Wong authored gitster committed
    Oops, I let a few patches slip by with long lines in them.
    Extracted from an unrelated patch by: Marcus Griep <marcus@griep.us>
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @neoeinstein @gitster

    git-svn: Allow deep branch names by supporting multi-globs

    neoeinstein authored gitster committed
    Some repositories use a deep branching strategy, such as:
    
        branches/1.0/1.0.rc1
        branches/1.0/1.0.rc2
        branches/1.0/1.0.rtm
        branches/1.0/1.0.gold
    
    Only allowing a single glob stiffles this.
    
    This change allows for a single glob 'set' to accept this deep
    branching strategy.
    
    The ref glob depth must match the branch glob depth.  When using
    the -b or -t options for init or clone, this is automatically
    done.
    
    For example, using the above branches:
    
      svn-remote.svn.branches = branches/*/*:refs/remote/*/*
    
    gives the following branch names:
    
      1.0/1.0.rc1
      1.0/1.0.rc2
      1.0/1.0.rtm
      1.0/1.0.gold
    
    [ew:
      * removed unrelated line-wrapping changes
      * fixed line-wrapping in a few more places
      * removed trailing whitespace
      * fixed bashism in test
      * removed unnecessary httpd startup in test
      * changed copyright on tests to 2008 Marcus Griep
      * added executable permissions to new tests
    ]
    
    Signed-off-by: Marcus Griep <marcus@griep.us>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @neoeinstein @gitster

    Fix multi-glob assertion in git-svn

    neoeinstein authored gitster committed
    Fixes bad regex match check for multiple globs (would always return
    one glob regardless of actual number).
    
    [ew: fixed a bashism in the test and some minor line-wrapping]
    
    Signed-off-by: Marcus Griep <marcus@griep.us>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @trast @gitster

    filter-branch: be more helpful when an annotated tag changes

    trast authored gitster committed
    Previously, git-filter-branch failed if it attempted to update an
    annotated tag.  Now we ignore this condition if --tag-name-filter is
    given, so that we can later rewrite the tag.  If no such option was
    provided, we warn the user that he might want to run with
    "--tag-name-filter cat" to achieve the intended effect.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @trast @gitster

    Documentation: filter-branch: document how to filter all refs

    trast authored gitster committed
    Document the '--' option that can be used to pass rev-list options
    (not just arguments), and give an example usage of '-- --all'.  Remove
    reference to "the new branch name"; filter-branch takes arbitrary
    arguments to rev-list since dfd05e3.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @gitster

    Makefile: add a target which will abort compilation with ancient shells

    Brandon Casey authored gitster committed
    This adds a make target which can be used to try to execute certain shell
    constructs which are required for compiling and running git.
    
    This patch provides a test for the $() notation for command substition
    which is used in the Makefile and extensively in the git scripts.
    
    The make target is named in such a way as to be a hint to the user that
    SHELL_PATH should be set to an appropriate shell. If the shell command
    fails, the user should receive a message similar to the following:
    
    make: *** [please_set_SHELL_PATH_to_a_more_modern_shell] Error 2
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @szeder @gitster

    bash: remove redundant check for 'git stash apply' options

    szeder authored gitster committed
    It will never trigger anyway because of the first check, and even if it
    would, it would not offer the command line option.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.