Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
tag: v1.4.1
Commits on Jul 2, 2006
  1. git object hash cleanups

    Linus Torvalds authored Junio C Hamano committed
    This IMNSHO cleans up the object hashing.
    
    The hash expansion is separated out into a function of its own, the hash
    array (and size) names are made more obvious, and the code is generally
    made to look a bit more like the object-ref hashing.
    
    It also gets rid of "find_object()" returning an index (or negative
    position if no object is found), since that is made redundant by the
    simplified object rehashing. The basic operation is now "lookup_object()"
    which just returns the object itself.
    
    There's an almost unmeasurable speed increase, but more importantly, I
    think the end result is more readable.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. revision.c: --full-history fix.

    Linus Torvalds authored Junio C Hamano committed
    With history simplification, we still show merges that are required
    to make the history _complete_, i.e. say that you had:
    
    	  a
    	  |
    	  b
    	 / \
    	c   d
    	|   |
    
    and neither "a" nor "b" actually changed the file, but both "c" and "d"
    did: in this case we have to leave "b" around just because otherwise there
    would be no way to show the _relationship_, even if "b" itself doesn't
    actually change the tree in any way what-so-ever.
    
    It would make sense to make that further simplification if the
    "--parents" flag wasn't present.  In that case the user is
    literally asking for a list of commits and is not interested in
    the relationship between them.
    
    This patch also fixes a real bug.  Without this patch, the
    "--parents --full-history" combination (which you'd get if you
    do something like
    
    	gitk --full-history Makefile
    
    or similar) will actually _drop_ merges where all children are identical.
    That's wrong in the --full-history case, because it means that the graph
    ends up missing lots of entries.
    
    In the process, this also should make
    
    	git-rev-list --full-history Makefile
    
    give just the _true_ list of all commits that changed Makefile (and
    properly ignore merges that were identical in one parent), because now
    we're not asking for "--parent", so we don't need the unnecessary merge
    commits to keep the history together.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Fix errno usage in connect.c

    Petr Baudis authored Junio C Hamano committed
    errno was used after it could've been modified by a subsequent library call.
    Spotted by Morten Welinder.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. @robinrosenberg

    Minor documentation fixup.

    robinrosenberg authored Junio C Hamano committed
    Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jul 1, 2006
  1. git-svn: allow a local target directory to be specified for init

    Eric Wong authored Junio C Hamano committed
    	git-svn init url://to/the/repo local-repo
    
    will create the local-repo dirrectory if doesn't exist yet and
    populate it as expected.
    
    Original patch by Luca Barbato, cleaned up and made to work for
    the current version of git-svn by me (Eric Wong).
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. don't load objects needlessly when repacking

    Nicolas Pitre authored Junio C Hamano committed
    If no delta is attempted on some objects then it is useless to load them
    in memory, neither create any delta index for them.  The best thing to
    do is therefore to load and index them only when really needed.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. upload-pack.c: <sys/poll.h> includes <ctype.h> on OpenBSD 3.8

    Junio C Hamano authored
    Merlyn reports that <sys/poll.h> on OpenBSD 3.8 includes <ctype.h>
    and having our custom ctype (done in git-compat-util.h which is
    included via cache.h) makes upload-pack.c uncompilable.  Try to
    work it around by including the system headers first.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jun 30, 2006
  1. Abstract out accesses to object hash array

    Linus Torvalds authored Junio C Hamano committed
    There are a few special places where some programs accessed the object
    hash array directly, which bothered me because I wanted to play with some
    simple re-organizations.
    
    So this patch makes the object hash array data structures all entirely
    local to object.c, and the few users who wanted to look at it now get to
    use a function to query how many object index entries there can be, and to
    actually access the array.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. consider previous pack undeltified object state only when reusing del…

    Nicolas Pitre authored Junio C Hamano committed
    …ta data
    
    Without this there would never be a chance to improve packing for
    previously undeltified objects.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Merge branch 'jc/test-3402'

    Junio C Hamano authored
    * jc/test-3402:
      Racy GIT (part #3)
Commits on Jun 29, 2006
  1. Do not try futile object pairs when repacking.

    Linus Torvalds authored Junio C Hamano committed
    In the repacking window, if both objects we are looking at already came
    from the same (old) pack-file, don't bother delta'ing them against each
    other.
    
    That means that we'll still always check for better deltas for (and
    against!) _unpacked_ objects, but assuming incremental repacks, you'll
    avoid the delta creation 99% of the time.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Racy GIT (part #3)

    Junio C Hamano authored
    Commit 29e4d36 fixed the
    underlying update-index races but git-commit was not careful
    enough to preserve the index file timestamp when copying the
    index file.  This caused t3402 test to occasionally fail.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Merge branch 'jc/repack'

    Junio C Hamano authored
    * jc/repack:
      git-repack: Be careful when updating the same pack as an existing one.
  4. Merge branch 'js/patch'

    Junio C Hamano authored
    * js/patch:
      diff.c: fix get_patch_id()
      t4014: fix test commit labels.
      format-patch: use clear_commit_marks() instead of some ad-hockery
      t4014: fix for whitespace from "wc -l"
      t4014: add format-patch --ignore-if-in-upstream test
      format-patch: introduce "--ignore-if-in-upstream"
      add diff_flush_patch_id() to calculate the patch id
  5. diff.c: fix get_patch_id()

    Junio C Hamano authored
    The function internally generated diff to get the patch id but
    passed a wrong emit flags to the xdiff layer when it did so.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. t4014: fix test commit labels.

    Junio C Hamano authored
    The commit tag and commit comments used in the test claimed that
    the #1 commit was merged upstream where the test actually let the
    upstream merge #2 commit.  Fix them.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. checkout -m: fix read-tree invocation

    Junio C Hamano authored
    When we updated "read-tree -m -u" to be careful about not
    removing untracked working tree files, we broke "checkout -m" to
    switch between branches.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jun 28, 2006
  1. t/README: start testing porcelainish

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. @dscho

    Save errno in handle_alias()

    dscho authored Junio C Hamano committed
    git.c:main() relies on the value of errno being set by the last attempt to
    execute the command. However, if something goes awry in handle_alias(),
    that assumption is wrong. So restore errno before returning from
    handle_alias().
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. rebase: check for errors from git-commit

    Eric Wong authored Junio C Hamano committed
    commit does not always succeed, so we'll have to check for
    it in the absence of set -e.  This fixes a regression
    introduced in 9e4bc7d
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. cvsimport - cleanup of the multi-indexes handling

    Martin Langhoff authored Junio C Hamano committed
    Indexes are only needed when we are about preparing to commit. Prime them
    inside commit() when we have all the info we need, and remove all the
    redundant index setups.
    
    While we are at it, make sure that index handling is correct when opening
    new branches, and on initial import.
    
    Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. connect.c: check the commit buffer boundary while parsing.

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. connect.c: remove unused parameters from tcp_connect and proxy_connect

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. @tihirvon

    Make some strings const

    tihirvon authored Junio C Hamano committed
    Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. rebase: get rid of outdated MRESOLVEMSG

    Eric Wong authored Junio C Hamano committed
    There was a time when rebase --skip didn't work when used with
    --merge, but that is no more so we don't need that message
    anymore.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. @ageric

    git wrapper: fix command name in an error message.

    ageric authored Junio C Hamano committed
    When the command execution by execv_git_cmd() fails with an errno
    other than ENOENT, we used an uninitialized variable instead of
    the string that holds the command name to report what failed.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. git-svn: be verbose by default on fetch/commit, add -q/--quiet option

    Eric Wong authored Junio C Hamano committed
    Slower connections can make git-svn look as if it's doing
    nothing for a long time; leaving the user wondering if we're
    actually doing anything.  Now we print some file progress just
    to assure the user that something is going on while they're
    waiting.
    
    Added the -q/--quiet option to users to revert to the old method
    if they preferred it.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. git-svn: add --follow-parent and --no-metadata options to fetch

    Eric Wong authored Junio C Hamano committed
    --follow-parent:
      This is especially helpful when we're tracking a directory
      that has been moved around within the repository, or if we
      started tracking a branch and never tracked the trunk it was
      descended from.
    
      This relies on the SVN::* libraries to work.  We can't
      reliably parse path info from the svn command-line client
      without relying on XML, so it's better just to have the SVN::*
      libs installed.
    
      This also removes oldvalue verification when calling update-ref
    
      In SVN, branches can be deleted, and then recreated under the
      same path as the original one with different ancestry
      information, causing parent information to be mismatched /
      misordered.
    
      Also force the current ref, if existing, to be a parent,
      regardless of whether or not it was specified.
    
    --no-metadata:
      This gets rid of the git-svn-id: lines at the end of every commit.
    
      With this, you lose the ability to use the rebuild command.  If
      you ever lose your .git/svn/git-svn/.rev_db file, you won't be
      able to fetch again, either.  This is fine for one-shot imports.
    
      Also fix some issues with multi-fetch --follow-parent that were
      exposed while testing this.  Additionally, repack checking is
      simplified greatly.
    
      git-svn log will not work on repositories using this, either.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  12. git-svn: add the commit-diff command

    Eric Wong authored Junio C Hamano committed
    This is intended for interoperability with git-svnimport.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  13. git-svn: several graft-branches improvements

    Eric Wong authored Junio C Hamano committed
    The 'graft-branches' command can now analyze tree matches for
    merge detection after commits are done, when --branch or
    --branch-all-refs options are used.
    
    We ensure that tree joins (--branch and --branch-all-refs
    options) during commit time only add SVN parents that occurred
    before the commit we're importing
    
    Also fixed branch detection via merge messages, this manner of
    merge detection (a la git-svnimport) is really all fuzzy, but at
    least it actually works now :)
    
    Add some new tests to go along with these fixes, too.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  14. git-svn: SVN 1.1.x library compatibility

    Eric Wong authored Junio C Hamano committed
    Tested on a plain Ubuntu Hoary installation
    using subversion 1.1.1-2ubuntu3
    
    1.1.x issues I had to deal with:
    
    * Avoid the noisy command-line client compatibility check if we
      use the libraries.
    
    * get_log() arguments differ (now using a nice wrapper from
      Junio's suggestion)
    
    * get_file() is picky about what kind of file handles it gets,
      so I ended up redirecting STDOUT.  I'm probably overflushing
      my file handles, but that's the safest thing to do...
    
    * BDB kept segfaulting on me during tests, so svnadmin will use FSFS
      whenever we can.
    
    * If somebody used an expanded CVS $Id$ line inside a file, then
      propsetting it to use svn:keywords will cause the original CVS
      $Id$ to be retained when asked for the original file.  As far as
      I can see, this is a server-side issue.  We won't care in the
      test anymore, as long as it's not expanded by SVN, a static
      CVS $Id$ line is fine.
    
    While we're at making ourselves more compatible, avoid grep
    along with the -q flag, which is GNU-specific. (grep avoidance
    tip from Junio, too)
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  15. combine-diff.c: type sanity

    Junio C Hamano authored
    - combine_diff() took cnt (count) which is unsigned in nature but the
      parameter type was declared as "int";
    - find_next() took "uninteresting" parameter, which masked a static
      function of the same name;
    - show_parent_lno() took an unused parameter "cnt";
    - show_patch_diff() used a local variable in nested inner scope with
      the same name with different type, masking the one in the outer scope;
    - the last loop in show_patch_diff iterated over lines so it should use
      the local variable "lno"
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  16. @peff

    quote.c: silence compiler warnings from EMIT macro

    peff authored Junio C Hamano committed
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jun 27, 2006
  1. @dscho

    format-patch: use clear_commit_marks() instead of some ad-hockery

    dscho authored Junio C Hamano committed
    It is cleaner, and it describes better what the idea behind the code is.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. @dstosberg

    Fix expr usage for FreeBSD

    dstosberg authored Junio C Hamano committed
    Some implementations of "expr" (e.g. FreeBSD's) fail, if an
    argument starts with a dash.
    
    Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Something went wrong with that request. Please try again.