Permalink
Commits on Nov 5, 2006
  1. Remove unsupported C99 style struct initializers in git-archive.

    spearce committed with Junio C Hamano Nov 5, 2006
    At least one older version of the Solaris C compiler doesn't support
    the newer C99 style struct initializers.  To allow Git to compile
    on those systems use an archive description struct which is easier
    to initialize without the C99 struct initializer syntax.
    
    Also since the archives array is not used by anyone other than
    archive.c we can make it static.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Remove SIMPLE_PROGRAMS and make git-daemon a normal program.

    spearce committed with Junio C Hamano Nov 5, 2006
    Some platforms (Solaris in particular) appear to require -lz as
    part of the link line for git-daemon, due to it linking against
    sha1_file.o and that module requiring inflate/deflate support.
    
    So its time to retire SIMPLE_PROGRAMS and move its last remaining
    member into the standard PROGRAMS list, allowing it to link against
    all libraries used by the rest of Git.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Use ULONG_MAX rather than implicit cast of -1.

    spearce committed with Junio C Hamano Nov 5, 2006
    At least one (older) version of the Solaris C compiler won't allow
    'unsigned long x = -1' without explicitly casting -1 to a type of
    unsigned long.  So instead use ULONG_MAX, which is really the
    correct constant anyway.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Nov 4, 2006
  1. apply: handle "traditional" creation/deletion diff correctly.

    Junio C Hamano committed Nov 4, 2006
    We deduced a GNU diff output that does not use /dev/null convention
    as creation (deletion) diff correctly by looking at the lack of context
    and deleted lines (added lines), but forgot to reset the new (old) name
    field properly.
    
    This was a regression when we added a workaround for --unified=0 insanity.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Nov 3, 2006
  1. git-clone documentation didn't mention --origin as equivalent of -o

    andyparkins committed with Junio C Hamano Nov 2, 2006
    Signed-off-by: Andy Parkins <andyparkins@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Minor grammar fixes for git-diff-index.txt

    andyparkins committed with Junio C Hamano Nov 2, 2006
    "what you are going to commit is" doesn't need the "is" and does need a comma.
    
    "can trivially see" is an unecessary split infinitive and "easily" is a more
    appropriate adverb.
    
    Signed-off-by: Andy Parkins <andyparkins@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. link_temp_to_file: call adjust_shared_perm() only when we created the…

    dscho committed with Junio C Hamano Nov 3, 2006
    … directory
Commits on Nov 1, 2006
  1. pack-objects doesn't create random pack names

    Nicolas Pitre committed with Junio C Hamano Nov 1, 2006
    Documentation for pack-objects seems to be out of date in this regard.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 31, 2006
  1. link_temp_to_file: don't leave the path truncated on adjust_shared_pe…

    Junio C Hamano committed Oct 31, 2006
    …rm failure
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. revision traversal: --unpacked does not limit commit list anymore.

    Junio C Hamano committed Oct 31, 2006
    This is needed to gain smaller latency back.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Continue traversal when rev-list --unpacked finds a packed commit.

    jaharkes committed with Junio C Hamano Oct 31, 2006
    When getting the list of all unpacked objects by walking the commit history,
    we would stop traversal whenever we hit a packed commit. However the fact
    that we found a packed commit does not guarantee that all previous commits
    are also packed. As a result the commit walkers did not show all reachable
    unpacked objects.
    
    Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Use memmove instead of memcpy for overlapping areas

    Edgar Toernig committed with Junio C Hamano Oct 31, 2006
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. quote.c: ensure the same quoting across platforms.

    Junio C Hamano committed Oct 31, 2006
    We read a byte from "char *" and compared it with ' ' to decide
    if it needs quoting to protect textual output.  With a platform
    where char is unsigned char that would give different result.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 30, 2006
  1. Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif"

    Junio C Hamano committed Oct 30, 2006
    Otherwise "make CFLAGS=-DDEBUG=1" is cumbersome to run.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 27, 2006
  1. gitweb: Check git base URLs before generating URL from it

    jnareb committed with Junio C Hamano Oct 26, 2006
    Check if each of git base URLs in @git_base_url_list is true before
    appending "/$project" to it to generate project URL.
    
    This fixes the error that for default configuration for gitweb in
    Makefile, with GITWEB_BASE_URL empty (and "++GITWEB_BASE_URL++" being
    "" in gitweb.cgi), we had URL of "/$project" in the summary view.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Documentation: add git in /etc/services.

    chriscool committed with Junio C Hamano Oct 27, 2006
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Documentation: add upload-archive service to git-daemon.

    chriscool committed with Junio C Hamano Oct 27, 2006
    This patch minimaly documents the upload-archive service,
    hoping that someone with better knowledge will improve upon.
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. git-cherry: document limit and add diagram

    Rene Scharfe committed with Junio C Hamano Oct 26, 2006
    This patch adds the diagram from the long usage string of git-cherry to
    its documentation, and documents the third option.  I changed some of
    the + to - in order to save the reader from wondering where they might
    fit into the picture.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Merge branch 'jc/combined' into maint

    Junio C Hamano committed Oct 27, 2006
    * jc/combined:
      combine-diff: honour --no-commit-id
      combine-diff: fix hunk_comment_line logic.
      combine-diff: a few more finishing touches.
  6. diff-format.txt: Correct information about pathnames quoting in patch…

    jnareb committed with Junio C Hamano Oct 26, 2006
    … format
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 26, 2006
  1. combine-diff: honour --no-commit-id

    Junio C Hamano committed Oct 26, 2006
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. combine-diff: fix hunk_comment_line logic.

    Junio C Hamano committed Oct 26, 2006
    We forgot that the last element of sline[] is a sentinel without
    the actual line.  *BLUSH*
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. combine-diff: a few more finishing touches.

    Junio C Hamano committed Oct 26, 2006
    "new file" and "deleted file" were already reported in the
    original code, but the logic was not as transparent as it could
    have.  This uses a few variables and more comments to clarify
    the flow.  The rule is: (1) if a path exists in the merge result
    when no parent had it, we report "new" (otherwise it came from
    the parents, as opposed to have added by the evil merge). (2) if
    the path does not exist in the merge result, it is "deleted".
    
    Since we can say "new" and "deleted", there is no reason not to
    follow the /dev/null convention.  This fixes it.
    
    Appending function name after @@@ ... @@@ is trivial, so
    implement it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Documentation: clarify refname disambiguation rules.

    Junio C Hamano committed Oct 26, 2006
    Nobody should create ambiguous refs (i.e. have tag "foobar" and branch
    "foobar" at the same time) that need to be disambiguated with these
    rules to keep sanity, but the rules are there so document them.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. diff-format.txt: Combined diff format documentation supplement

    jnareb committed with Junio C Hamano Oct 26, 2006
    Update example combined diff format to the current version
    $ git diff-tree -p -c fec9ebf
    and provide complete first chunk in example.
    
    Document combined diff format headers: how "diff header" look like,
    which of "extended diff headers" are used with combined diff and how
    they look like, differences in two-line from-file/to-file header from
    non-combined diff format, chunk header format.
    
    It should be noted that combined diff format was designed for quick
    _content_ inspection and renames would work correctly to pick which
    blobs from each tree to compare but otherwise not reflected in the
    output (the pathnames are not shown).
    
    [jc: with minimum copyediting]
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Remove --syslog in git-daemon inetd documentation examples.

    chriscool committed with Junio C Hamano Oct 26, 2006
    It is useless because --inetd implies --syslog.
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. Documentation: updates to "Everyday GIT"

    bfields committed with Junio C Hamano Oct 26, 2006
    Remove the introduction: I think it should be obvious why
    we have this.  (And if it isn't obvious then we've got other
    problems.)
    
    Replace reference to git whatchanged by git log.
    
    Miscellaneous style and grammar fixes.
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 25, 2006
  1. Documentation/SubmittingPatches: 3+1 != 6

    Junio C Hamano committed Oct 25, 2006
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. xdiff: Match GNU diff behaviour when deciding hunk comment worthiness…

    Petr Baudis committed with Junio C Hamano Oct 25, 2006
    … of lines
    
    This removes the '#' and '(' tests and adds a '$' test instead although I have
    no idea what it is actually good for - but hey, if that's what GNU diff does...
    
    Pasky only went and did as Junio sayeth.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Update cherry documentation.

    Junio C Hamano committed Oct 25, 2006
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Refer to git-rev-parse:Specifying Revisions from git.txt

    Junio C Hamano committed Oct 25, 2006
    The brief list given in "Symbolic Identifiers" section of the
    main documentation is good enough for overview, but help the
    reader to find a more comrehensive list as needed.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. git-fetch.sh printed protocol fix

    tuncer committed with Junio C Hamano Oct 25, 2006
    We have supported https:// protocol for some time and in 1.4.3
    added ftp:// protocol.  The transfer were still reported to be
    over http.
    
    [jc: Tuncer used substring parameter substitution ${remote%%:*}
     but I am deferring it to a later day.  We should replace
     colon-expr with substring substitution after everybody's shell
     can grok it someday, but we are not in a hurry. ]
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. RPM package re-classification.

    Junio C Hamano committed with Junio C Hamano Oct 25, 2006
    Grabbing anything that had *arch* in its name into git-arch
    package was a wrong idea and we lost git-archive from git-core
    by mistake.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 24, 2006
  1. Documentation: note about contrib/.

    Junio C Hamano committed Oct 24, 2006
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. git-svn: fix symlink-to-file changes when using command-line svn 1.4.0

    Eric Wong committed with Junio C Hamano Oct 24, 2006
    I incorrectly thought this was hopelessly broken in svn 1.4.0,
    but now it's just broken in that the old method didn't work.  It
    looks like svn propdel and svn propset must be used now and the
    (imho) more obvious svn rm --force && svn add no longer works.
    
    "make -C t full-svn-test" should now work.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Acked-by: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>