Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v1.4.2-rc4

Aug 09, 2006

  1. allow diff.renamelimit to be set regardless of -M/-C

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 09, 2006
  2. make --find-copies-harder imply -C

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 09, 2006
  3. find_unique_abbrev() with len=0 should not abbreviate

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 09, 2006
  4. check return value from diff_setup_done()

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 09, 2006
  5. Fix tutorial-2.html

    Honza Pazdziora noticed that one example did not match reality.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 09, 2006
  6. Documentation: git-status takes the same options as git-commit

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 07, 2006
  7. Jonas Fonseca

    Update git-init-db(1) and documentation of core.sharedRepository

    Combine option descriptions in git-init-db(1). Reflect the changes to
    additionally allow all users to read the created git repository.
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 09, 2006 Junio C Hamano committed August 08, 2006

Aug 08, 2006

  1. Jeff King

    git-push: allow pushing from subdirectories

    The semantics are equivalent to pushing from the root; we just try harder to
    find the .git directory.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 08, 2006 Junio C Hamano committed August 08, 2006
  2. GIT-VERSION-GEN: adjust for ancient git

    When an ancient "git" that does not understand "describe"
    command is on the $PATH, "git describe" emitted a Usage message
    without exiting non-zero status (which is a mistake we cannot
    fix retroactively).  Catch this case to make sure we do not try
    using phoney multi-line string as a version number.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 08, 2006
  3. builtin-mv: fix use of uninitialized memory.

    Juergen Ruehle noticed that add_slash() tries to strcat()
    into uninitialized memory and fails.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 08, 2006
  4. debugging: XMALLOC_POISON

    Compile with -DXMALLOC_POISON=1 to catch errors from using uninitialized
    memory returned by xmalloc.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 08, 2006

Aug 07, 2006

  1. pugmajere

    annotate: Fix bug when parsing merges with differing real and logical…

    … parents.
    
    Signed-off-by: Ryan Anderson <ryan@michonline.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 07, 2006 Junio C Hamano committed August 07, 2006
  2. pugmajere

    log-tree: show_log() should respect the setting of diffopt->line_term…

    …ination
    
    Signed-off-by: Ryan Anderson <ryan@michonline.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 07, 2006 Junio C Hamano committed August 07, 2006
  3. Michael Krelin

    handle https:// protocol in git-clone

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 07, 2006 Junio C Hamano committed August 07, 2006

Aug 06, 2006

  1. Fix "grep -w"

    We used to find the first match of the pattern and then if the
    match is not for the entire word, declared that the whole line
    does not match.
    
    But that is wrong.  The command "git grep -w -e mmap" should
    find that a line "foo_mmap bar mmap baz" matches, by tring the
    second instance of pattern "mmap" on the same line.
    
    Problems an earlier round of "fix" had were pointed out by Morten
    Welinder, which have been incorporated in the t7002 tests.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 04, 2006

Aug 05, 2006

  1. Makefile: Cygwin does not seem to need NO_STRLCPY

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 05, 2006
  2. commit walkers: setup_ident() to record correct committer in ref-log.

    The function pull() in fetch.c calls write_ref_sha1(), which may
    need committer identity to update the ref-log, so they need to
    call setup_ident() before calling git_config() function.
    
    Acked-by: Shawn Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 04, 2006 Junio C Hamano committed August 05, 2006
  3. Allow config file to specify Signed-off-by identity in format-patch.

    Unlike git-commit, git-format-patch was not picking up and using the
    user.email config variable for the email part of the committer info.
    I was forced to use the GIT_COMMITTER_EMAIL environment variable to
    override the default <user@localhost.localdomain>. The fix was to
    simply move the call to setup_ident() to come before the git_config()
    call.
    
    Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
    Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 04, 2006 Junio C Hamano committed August 04, 2006

Aug 04, 2006

  1. Merge branch 'jc/c99'

    * jc/c99:
      Cygwin needs NO_C99_FORMAT???
    authored August 04, 2006
  2. dscho

    Fix crash when GIT_DIR is invalid

    We used to test if a pointer was NULL, and if it was, try to access it.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 04, 2006 Junio C Hamano committed August 04, 2006
  3. git-tar-tree: fix minor memory leak

    Free the root tree object buffer when we're done, plugging a minor leak
    in generate_tar().  Note: we cannot simply free(tree.buf) because this
    pointer is modified by tree_entry() calls in traverse_tree().
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 04, 2006 Junio C Hamano committed August 04, 2006
  4. Document rev-list's option --merge

    Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 04, 2006 Junio C Hamano committed August 04, 2006
  5. Further clean-up: usage() vs die()

    This hopefully finishes the clean-up Ramsay started with recent
    commit 15e593e and commit
    8cdf336.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 03, 2006
  6. Replace some calls to die(usage_str) with usage(usage_str).

    The only change in behaviour should be having a "usage: " prefix
    on the output string rather than "fatal: ", and an exit code of
    129 rather than 128.
    
    Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 03, 2006 Junio C Hamano committed August 03, 2006
  7. Fixup command names in some usage strings.

    Most usage strings, such as for command xxx, start with "git-xxx".
    This updates the rebels to conform to the general pattern.
    (The git wrapper is an exception to this, of course ...)
    
    Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 03, 2006 Junio C Hamano committed August 03, 2006

Aug 03, 2006

  1. GIT 1.4.2-rc3

    We ended up merging too many stuff after -rc2, so here is
    another round of release candidate.  Non bugfixes will be
    queued to "next" from now on until a real 1.4.2 happens.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 03, 2006
  2. Documentation/git.txt: link git-svn and git-instaweb from the main page.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 03, 2006
  3. Merge branch 'jc/sideband'

    * jc/sideband:
      sideband: do not use color, just say "remote:"
      fetch/clone: mark messages from remote side stand out.
    authored August 03, 2006
  4. sideband: do not use color, just say "remote:"

    ... per suggestion by Andrew.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 03, 2006
  5. Show both blob names from "git diff blob1 blob2"

    Earlier we deliberately showed only blob1's name because showing
    both names labeled the output as a renaming patch.  Now the output
    routine (namely, diff.c::resolve_rename_copy()) is taught not to
    use pathname comparison to tell if a filepair is a rename, we can
    safely do this change.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 03, 2006
  6. diff.c: do not use pathname comparison to tell renames

    The final output from diff used to compare pathnames between
    preimage and postimage to tell if the filepair is a rename/copy.
    By explicitly marking the filepair created by diffcore_rename(),
    the output routine, resolve_rename_copy(), does not have to do
    so anymore.  This helps feeding a filepair that has different
    pathnames in one and two elements to the diff machinery (most
    notably, comparing two blobs).
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 03, 2006
  7. Add a couple of subdirectory tests.

    We still have too few of them, but we have to start from somewhere.
    The general rule is to make tests easy to debug when run with -v (notice
    use of seemingly useless echo everywhere in the new tests).
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 03, 2006
  8. read-tree: shadowed variable fix.

    Recent changes to built-ins broke committing from subdirectory,
    because the unused parameter "prefix" shadowed a global variable.
    
    Spotted by Jeff King.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 03, 2006
  9. fixed variable declaration in gitk

    Signed-off-by: Michael <barra_cuda@katamail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 03, 2006 Junio C Hamano committed August 03, 2006
  10. Fix "git diff blob1 blob2" showing the diff in reverse.

    This was introduced by mistake when revision.c::add_pending_object()
    was modified to use object-array instead of object-list.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    authored August 03, 2006
Something went wrong with that request. Please try again.