Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Sep 6, 2010
  1. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      tag.c: whitespace breakages fix
      Fix whitespace issue in object.c
      t5505: add missing &&
  2. @gitster

    Merge branch 'xx/trivial' into maint

    gitster authored
    * xx/trivial:
      tag.c: whitespace breakages fix
      Fix whitespace issue in object.c
      t5505: add missing &&
  3. @gitster

    tag.c: whitespace breakages fix

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

    Fix whitespace issue in object.c

    jhance authored gitster committed
    Change some expanded tabs (spaces) to tabs in object.c.
    
    Signed-off-by: Jared Hance <jaredhance@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @jlehmann @gitster

    t5505: add missing &&

    jlehmann authored gitster committed
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 4, 2010
  1. @gitster

    Merge branch 'jl/submodule-ignore-diff'

    gitster authored
    * jl/submodule-ignore-diff:
      checkout: Use submodule.*.ignore settings from .git/config and .gitmodules
      checkout: Add test for diff.ignoreSubmodules
      checkout: respect diff.ignoreSubmodules setting
    
    Conflicts:
    	builtin/checkout.c
  2. @gitster

    Merge branch 'ab/test-2'

    gitster authored
    * ab/test-2: (51 commits)
      tests: factor HOME=$(pwd) in test-lib.sh
      test-lib: use subshell instead of cd $new && .. && cd $old
      tests: simplify "missing PREREQ" message
      t/t0000-basic.sh: Run the passing TODO test inside its own test-lib
      test-lib: Allow overriding of TEST_DIRECTORY
      test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../
      test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../
      test: Introduce $GIT_BUILD_DIR
      cvs tests: do not touch test CVS repositories shipped with source
      t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite
      t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite
      t/t7105-reset-patch.sh: Add a PERL prerequisite
      t/t9001-send-email.sh: convert setup code to tests
      t/t9001-send-email.sh: change from skip_all=* to prereq skip
      t/t9001-send-email.sh: Remove needless PROG=* assignment
      t/t9600-cvsimport.sh: change from skip_all=* to prereq skip
      lib-patch-mode tests: change from skip_all=* to prereq skip
      t/t3701-add-interactive.sh: change from skip_all=* to prereq skip
      tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh
      t/Makefile: Create test-results dir for smoke target
      ...
    
    Conflicts:
    	t/t6035-merge-dir-to-symlink.sh
  3. @gitster

    Merge branch 'js/detached-stash'

    gitster authored
    * js/detached-stash:
      t3903: fix broken test_must_fail calls
      detached-stash: update Documentation
      detached-stash: tests of git stash with stash-like arguments
      detached-stash: simplify git stash show
      detached-stash: simplify git stash branch
      detached-stash: refactor git stash pop implementation
      detached-stash: simplify stash_drop
      detached-stash: simplify stash_apply
      detached-stash: work around git rev-parse failure to detect bad log refs
      detached-stash: introduce parse_flags_and_revs function
  4. @gitster

    Merge branch 'js/maint-reflog-beyond-horizon'

    gitster authored
    * js/maint-reflog-beyond-horizon:
      t1503: fix broken test_must_fail calls
      rev-parse: tests git rev-parse --verify master@{n}, for various n
      sha1_name.c: use warning in preference to fprintf(stderr
      rev-parse: exit with non-zero status if ref@{n} is not valid.
  5. @gitster

    Merge branch 'dg/local-mod-error-messages'

    gitster authored
    * dg/local-mod-error-messages:
      t7609-merge-co-error-msgs: test non-fast forward case too.
      Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
      setup_unpack_trees_porcelain: take the whole options struct as parameter
      Move set_porcelain_error_msgs to unpack-trees.c and rename it
    
    Conflicts:
    	merge-recursive.c
  6. @gitster

    Merge branch 'nd/maint-fix-replace'

    gitster authored
    * nd/maint-fix-replace:
      parse_object: pass on the original sha1, not the replaced one
  7. @pclouds @gitster

    parse_object: pass on the original sha1, not the replaced one

    pclouds authored gitster committed
    Commit 0e87c36 (object: call "check_sha1_signature" with the
    replacement sha1) changed the first argument passed to
    parse_object_buffer() from "sha1" to "repl". With that change,
    the returned obj pointer has the replacement SHA1 in obj->sha1,
    not the original one.
    
    But when using lookup_commit() and then parse_commit() on a
    commit, we get an object pointer with the original sha1, but
    the commit content comes from the replacement commit.
    
    So the result we get from using parse_object() is different
    from the we get from using lookup_commit() followed by
    parse_commit().
    
    It looks much simpler and safer to fix this inconsistency by
    passing "sha1" to parse_object_bufer() instead of "repl".
    
    The commit comment should be used to tell the the replacement
    commit is replacing another commit and why. So it should be
    easy to see that we have a replacement commit instead of an
    original one.
    
    And it is not a problem if the content of the commit is not
    consistent with the sha1 as cat-file piped to hash-object can
    be used to see the difference.
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 3, 2010
  1. @gitster

    Merge branch 'ab/compat-regex'

    gitster authored
    * ab/compat-regex:
      Fix compat/regex ANSIfication on MinGW
      autoconf: regex library detection typofix
      autoconf: don't use platform regex if it lacks REG_STARTEND
      t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND
      compat/regex: get rid of old-style definition
      compat/regex: define out variables only used under RE_ENABLE_I18N
      Change regerror() declaration from K&R style to ANSI C (C89)
      compat/regex: get the gawk regex engine to compile within git
      compat/regex: use the regex engine from gawk for compat
    
    Conflicts:
    	compat/regex/regex.c
  2. @gitster

    Merge branch 'nd/clone-depth-zero'

    gitster authored
    * nd/clone-depth-zero:
      clone: warn users --depth is ignored in local clones
  3. @gitster

    Merge branch 'jn/maint-doc-user-manual-html-doctype'

    gitster authored
    * jn/maint-doc-user-manual-html-doctype:
      docs: fix Makefile dependency for user manual
      Documentation: set a !DOCTYPE for user manual
  4. @gitster

    Merge branch 'cb/maint-mergetool-no-tty'

    gitster authored
    * cb/maint-mergetool-no-tty:
      mergetool: Remove explicit references to /dev/tty
    
    Conflicts:
    	git-mergetool.sh
  5. @gitster

    Merge branch 'jn/apply-filename-with-sp'

    gitster authored
    * jn/apply-filename-with-sp:
      apply: handle traditional patches with space in filename
      tests: exercise "git apply" with weird filenames
      apply: split quoted filename handling into new function
  6. @gitster

    Merge branch 'jn/merge-custom-no-trivial'

    gitster authored
    * jn/merge-custom-no-trivial:
      t7606: Avoid using head as a file name
      merge: let custom strategies intervene in trivial merges
      t7606 (merge-theirs): modernize style
  7. @gitster

    Merge branch 'jc/maint-doc-em-dash'

    gitster authored
    * jc/maint-doc-em-dash:
      Work around em-dash handling in newer AsciiDoc
  8. @gitster

    Merge branch 'mg/doc-bundle'

    gitster authored
    * mg/doc-bundle:
      git-bundle.txt: Clarify rev-list-args restrictions
      git-bundle.txt: whitespace cleanup
      git-bundle.txt: Cleanup
    
    Conflicts:
    	Documentation/git-bundle.txt
  9. @gitster

    Merge branch 'jn/doc-backslash'

    gitster authored
    * jn/doc-backslash:
      Documentation: remove stray backslash in show-branch discussion
      Documentation: remove stray backslashes from "Fighting regressions" article
      Documentation: do not convert ... operator to ellipses
      Documentation: avoid stray backslash in user manual
      Documentation: avoid stray backslashes in core tutorial
      Documentation: remove stray backslashes in rev-parse manual
      Documentation: remove backslash before ~ in fast-import manual
      Documentation: remove stray backslash from "git bundle" manual
      Documentation/technical: avoid stray backslash in parse-options API docs
      Documentation: remove backslashes in manpage synopses
      Documentation: clarify quoting in gitignore docs
      Documentation: clarify quoting in "git rm" example
      Documentation: add missing quotes to "git grep" examples
      Documentation: clarify quoting in "git add" example
      Documentation: unbreak regex in show-ref manual
      Documentation: quoting trouble in "git rm" discussion
      Documentation: tweak description of log.date
  10. @gitster

    Merge branch 'jn/update-contrib-example-merge'

    gitster authored
    * jn/update-contrib-example-merge: (24 commits)
      merge script: learn --[no-]rerere-autoupdate
      merge script: notice @{-1} shorthand
      merge script: handle --no-ff --no-commit correctly
      merge script: --ff-only to disallow true merge
      merge script: handle many-way octopus
      merge script: handle -m --log correctly
      merge script: forbid merge -s index
      merge script: allow custom strategies
      merge script: merge -X<option>
      merge script: improve log message subject
      merge script: refuse to merge during merge
      merge script: tweak unmerged files message to match builtin
      merge script: --squash, --ff from unborn branch are errors
      fmt-merge-msg -m to override merge title
      merge-base --independent to print reduced parent list in a merge
      merge-base --octopus to mimic show-branch --merge-base
      Documentation: add a SEE ALSO section for merge-base
      t6200 (fmt-merge-msg): style nitpicks
      t6010 (merge-base): modernize style
      t7600 (merge): test merge from branch yet to be born
      ...
  11. @gitster

    Merge branch 'jn/merge-renormalize'

    gitster authored
    * jn/merge-renormalize:
      merge-recursive --renormalize
      rerere: never renormalize
      rerere: migrate to parse-options API
      t4200 (rerere): modernize style
      ll-merge: let caller decide whether to renormalize
      ll-merge: make flag easier to populate
      Documentation/technical: document ll_merge
      merge-trees: let caller decide whether to renormalize
      merge-trees: push choice to renormalize away from low level
      t6038 (merge.renormalize): check that it can be turned off
      t6038 (merge.renormalize): try checkout -m and cherry-pick
      t6038 (merge.renormalize): style nitpicks
      Don't expand CRLFs when normalizing text during merge
      Try normalizing files to avoid delete/modify conflicts when merging
      Avoid conflicts when merging branches with mixed normalization
    
    Conflicts:
    	builtin/rerere.c
    	t/t4200-rerere.sh
  12. @gitster

    Sync with 1.7.2.3

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

    Git 1.7.2.3

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

    builtin/merge_recursive.c: Add an usage string and make use of it.

    Thiago Farina authored gitster committed
    This improves the usage output by adding builtin_merge_recursive_usage string
    that follows the same pattern used by the other builtin commands.
    
    The previous output for git merger-recursive was:
    usage: merge-recursive <base>... -- <head> <remote> ...
    
    Now the output is:
    usage: git merge-recursive <base>... -- <head> <remote> ...
    
    Since cmd_merge_recursive is used to handle four different commands we need
    the %s in the usage string, so the following example:
    
    $ git merge-subtree -h
    
    Will output:
    usage: git merge-subtree <base>... -- <head> <remote> ...
    
    Signed-off-by: Thiago Farina <tfransosi@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  15. @jlehmann @gitster

    t7406 & t7407: add missing && at end of lines

    jlehmann authored gitster committed
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  16. @jlehmann @gitster

    t7405: cd inside subshell instead of around

    jlehmann authored gitster committed
    Instead of using `cd dir && (...) && cd..` use `(cd dir && ...)`
    
    This ensures that the test doesn't get caught in the subdirectory if there
    is an error in the subshell.
    
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  17. @moy @gitster

    t7609-merge-co-error-msgs: test non-fast forward case too.

    moy authored gitster committed
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  18. @moy @gitster

    Move "show_all_errors = 1" to setup_unpack_trees_porcelain()

    moy authored gitster committed
    Not only this makes the code clearer since setting up the porcelain error
    message is meant to work with show_all_errors, but this fixes a call to
    setup_unpack_trees_porcelain() in git_merge_trees() which did not set
    show_all_errors.
    
    add_rejected_path() used to double-check whether it was running in
    plumbing mode. This check was ineffective since it was setting
    show_all_errors too late for traverse_trees() to see it, and is made
    useless by this patch. Remove it.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  19. @moy @gitster

    setup_unpack_trees_porcelain: take the whole options struct as parameter

    moy authored gitster committed
    This is a preparation patch to let setup_unpack_trees_porcelain set
    show_all_errors itself.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  20. @moy @gitster

    Move set_porcelain_error_msgs to unpack-trees.c and rename it

    moy authored gitster committed
    The function is currently dealing only with error messages, but the
    intent of calling it is really to notify the unpack-tree mechanics that
    it is running in porcelain mode.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 1, 2010
  1. @gitster

    Prepare for 1.7.3

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

    Merge branch 'maint'

    gitster authored
    * maint:
      Prepare for 1.7.2.3
  3. @gitster

    Prepare for 1.7.2.3

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.