Permalink
Commits on Sep 29, 2010
  1. Git 1.7.3.1

    gitster committed Sep 29, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. stash: fix git stash branch regression when branch creation fails

    jonseymour committed with gitster Sep 28, 2010
    "git stash branch <branch> <stash>" started discarding the stash
    when the branch creation fails.  It should have kept the stash
    intact when aborting.
    
    Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. stash drops the stash even if creating the branch fails because it al…

    wereHamster committed with gitster Sep 28, 2010
    …ready exists
    
    This bug was disovered by someone on IRC when he tried to
    
        $ git stash branch <branch> <stash>
    
    while <branch> already existed. In that case the stash is dropped even
    though it isn't applied on any branch, so the stash is effectively lost.
    
    Signed-off-by: Tomas Carnecky <tom@dbservice.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 27, 2010
  1. Fix missing 'does' in man-page for 'git checkout'

    torvalds committed with gitster Sep 27, 2010
    Reported-by: Rainer Standke <rainer.standke@krankikom.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. dir.c: squelch false uninitialized memory warning

    patnotz committed with gitster Sep 16, 2010
    GCC 4.4.4 on MacOS incorrectly warns about potential use of uninitialized memory.
    
    Signed-off-by: Pat Notz <patnotz@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. git-send-email.perl: ensure $domain is defined before using it

    drafnel committed with gitster Sep 27, 2010
    valid_fqdn() may attempt to operate on an undefined value if
    Net::Domain::domainname fails to determine the domain name.  This causes
    perl to emit unpleasant warnings.
    
    So, add a check for whether $domain has been defined before using it.
    
    Signed-off-by: Brandon Casey <drafnel@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. wt-status.c: don't leak directory entries when processing untracked,i…

    drafnel committed with gitster Sep 27, 2010
    …gnored
    
    When iterating through the list of directory entries, searching for
    untracked entries, only the entries added to the string_list were free'd.
    The rest (tracked or not matching the pathspec) were leaked.
    
    Ditto for the "ignored" loop.
    
    Rearrange the loops so that all entries are free'd.
    
    Signed-off-by: Brandon Casey <drafnel@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. t6050 (replace): fix bogus "fetch branch with replacement" test

    chriscool committed with gitster Sep 26, 2010
    The test was missing some "&&" at the end of some lines and it
    was wrong because, as the replacement refs were not fetched,
    the commits from the parallel branch should not show up. This
    was found by Elijah Newren.
    
    This is fixed by checking that after the branch from HASH6 is
    fetched, the commits from the parallel branch don't show up,
    and then by fetching the replacement refs and checking that
    they do show up afterwards.
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Documentation: Refer to git-commit-tree in git-filter-branch help

    wjl committed with gitster Sep 13, 2010
    Currently, the help for git filter-branch refers users of --env-filter
    to git-commit for information about environment variables affecting
    commits. However, this information is not contained in the git-commit
    help, but is very explicitly detailed in git-commit-tree.
    
    Signed-off-by: Wesley J. Landaker <wjl@icecavern.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. update comment and documentation for :/foo syntax

    moy committed with gitster Sep 24, 2010
    The documentation in revisions.txt did not match the implementation, and
    the comment in sha1_name.c was incomplete.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. Improvements to `git checkout -h`

    knittl committed with gitster Sep 24, 2010
    be a little more verbose about what each option does
    
    Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. contrib/completion: --no-index option to git diff

    mjg committed with gitster Sep 23, 2010
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. prefer test -h over test -L in shell scripts

    peff committed with gitster Sep 22, 2010
    Even though "-L" is POSIX, the former is more portable, and
    we tend to prefer it already.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. CodingGuidelines: spell Arithmetic Expansion with $(($var))

    gitster committed Sep 22, 2010
    POSIX wants shells to support both "N" and "$N" and requires them to yield
    the same answer to $((N)) and $(($N)), but we should aim for portability
    in a case like this, especially when the price we pay to do so is so
    small, i.e. a few extra dollars.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. t1503: Fix arithmetic expansion syntax error when using dash

    Ramsay Jones committed with gitster Sep 21, 2010
    On systems which have dash as /bin/sh, such as Ubuntu, the final
    test (master@{n} for various n) fails with a syntax error while
    processing an arithmetic expansion. The syntax error is caused by
    using a bare name ('N') as a variable reference in the expression.
    
    In order to avoid the syntax error, we spell the variable reference
    as '$N' rather than simply 'N'.
    
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. strbuf.h: fix comment typo

    patnotz committed with gitster Sep 16, 2010
    Signed-off-by: Pat Notz <patnotz@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  14. git-stash: fix flag parsing

    Benabik committed with gitster Sep 24, 2010
    Currently git-stash uses `git rev-parse --no-revs -- "$@"` to set its
    FLAGS variable.  This is the same as `FLAGS="-- $@"`.  It should use
    `git rev-parse --no-revs --flags "$@"`, but that eats any "-q" or
    "--quiet" argument.  So move the check for quiet before rev-parse.
    
    Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  15. t/t3903-stash: improve testing of git-stash show

    drafnel committed with gitster Sep 24, 2010
    Recently, the 'stash show' functionality was broken for the case when a
    stash-like argument was supplied.  Since, commit 9bf09e, 'stash show' when
    supplied a stash-like argument prints nothing and still exists with a zero
    status.  Unfortunately, the flaw slipped through the test suite cracks
    since the output of 'stash show' was not verified to be correct.
    
    Improve and expand on the existing tests so that this flaws is detected.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 18, 2010
  1. Git 1.7.3

    gitster committed Sep 18, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'js/ls-files-x-doc'

    gitster committed Sep 18, 2010
    * js/ls-files-x-doc:
      ls-files documentation: reword for consistency
      git-ls-files.txt: clarify -x/--exclude option
    
    Conflicts:
    	Documentation/git-ls-files.txt
Commits on Sep 17, 2010
  1. git-rebase--interactive.sh: replace cut with ${v%% *}

    ChrisJohnsen committed with gitster Sep 17, 2010
    Some versions of cut do not cope well with lines that do not end in
    an LF. In this case, we can completely avoid cut by using the
    ${var%% *} parameter expansion (suggested by Brandon Casey).
    
    I found this problem when t3404's "avoid unnecessary reset" failed
    due to the "rebase -i" not avoiding updating the tested timestamp.
    
    On a Mac OS X 10.4.11 system:
    
        % printf '%s' 'foo bar' | /usr/bin/cut -d ' ' -f 1
        cut: stdin: Illegal byte sequence
    
    Signed-off-by: Chris Johnsen <chris_johnsen@pobox.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. t/t7300: workaround ancient touch by rearranging arguments

    drafnel committed with gitster Sep 15, 2010
    The ancient touch on Solaris 7 thinks that a decimal number supplied as
    the first argument specifies a date_time to give to the files specified by
    the remaining arguments.  In this case, it fails to parse '1' as a proper
    date_time and exits with a failure status.  Workaround this flaw by
    rearranging the arguments supplied to touch so that a non-digit appears
    first and touch will not be confused.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 16, 2010
  1. Merge branch 'bg/fix-t7003'

    gitster committed Sep 16, 2010
    * bg/fix-t7003:
      t7003: Use test_commit instead of custom function
  2. ls-files documentation: reword for consistency

    gitster committed Sep 16, 2010
    Similar to descriptions of other options, state what -x does in imperative
    mood.  Start sentences for -X and --exclude-per-directory options in
    capital letters.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. git-ls-files.txt: clarify -x/--exclude option

    jaysoffian committed with gitster Sep 15, 2010
    Since b5227d8, -x/--exclude does not apply to cached files.
    This is easy to miss unless you read the discussion in the
    EXCLUDE PATTERNS section. Clarify that the option applies
    to untracked files and direct the reader to EXCLUDE PATTERNS.
    
    Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 15, 2010
  1. Git 1.7.3 rc2

    gitster committed Sep 15, 2010
  2. Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'

    gitster committed Sep 15, 2010
    * dr/maint-ls-tree-prefix-recursion-fix:
      ls-tree $di $dir: do not mistakenly recurse into directories
  3. Merge branch 'os/fix-rebase-diff-no-prefix'

    gitster committed Sep 15, 2010
    * os/fix-rebase-diff-no-prefix:
      Add --src/dst-prefix to git-formt-patch in git-rebase.sh
  4. Merge branch 'jl/fix-test'

    gitster committed Sep 15, 2010
    * jl/fix-test:
      t1020: Get rid of 'cd "$HERE"' at the start of each test
      t2016 (checkout -p): add missing &&
      t1302 (core.repositoryversion): style tweaks
      t2105 (gitfile): add missing &&
      t1450 (fsck): remove dangling objects
      tests: subshell indentation stylefix
      Several tests: cd inside subshell instead of around
  5. Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'

    gitster committed Sep 15, 2010
    * ch/filter-branch-deprecate-remap-to-ancestor:
      filter-branch: retire --remap-to-ancestor
  6. Merge branch 'ch/maint-cannot-create-bundle-error'

    gitster committed Sep 15, 2010
    * ch/maint-cannot-create-bundle-error:
      bundle: detect if bundle file cannot be created
  7. Merge branch 'ks/recursive-rename-add-identical'

    gitster committed Sep 15, 2010
    * ks/recursive-rename-add-identical:
      RE: [PATCH] Avoid rename/add conflict when contents are identical
  8. Merge git://repo.or.cz/git-gui

    gitster committed Sep 15, 2010
    * 'master' of git://repo.or.cz/git-gui:
      git-gui 0.13
      git-gui: avoid mis-encoding the copyright message on Windows.
      git-gui: Update Swedish translation (521t).
      git-gui: ensure correct application termination in git-gui--askpass
      git-gui: handle textconv filter on Windows and in development
      git-gui: use shell to launch textconv filter in "blame"
      git-gui: display error launching blame as a message box.
      git-gui: Make usage statement visible on Windows.
Commits on Sep 14, 2010
  1. git-gui 0.13

    patthoyts committed Sep 14, 2010
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Commits on Sep 13, 2010
  1. git-gui: avoid mis-encoding the copyright message on Windows.

    patthoyts committed Sep 13, 2010
    On Windows the tcl script file will use the system encoding and attempting
    to convert the copyright mis-encodes the string. Instead, keep the message
    as ASCII and substitute in the correct unicode character when running.
    
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>