git, branch v1.7.4-rc3

Git 1.7.4-rc3

2011-01-24T19:00:00Z

Signed-off-by: Junio C Hamano

Merge branch 'as/userdiff-pascal'

2011-01-24T18:54:12Z

* as/userdiff-pascal: userdiff: match Pascal class methods

Merge branch 'jn/setup-fixes'

2011-01-24T18:53:09Z

* jn/setup-fixes: t1510: fix typo in the comment of a test Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase Subject: setup: officially support --work-tree without --git-dir tests: compress the setup tests tests: cosmetic improvements to the repo-setup test t/README: hint about using $(pwd) rather than $PWD in tests Fix expected values of setup tests on Windows

t1510: fix typo in the comment of a test

2011-01-24T18:14:57Z

Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase

2011-01-24T18:13:59Z

Signed-off-by: Junio C Hamano

Subject: setup: officially support --work-tree without --git-dir

2011-01-21T22:31:24Z

The original intention of --work-tree was to allow people to work in a subdirectory of their working tree that does not have an embedded .git directory. Because their working tree, which their $cwd was in, did not have an embedded .git, they needed to use $GIT_DIR to specify where it is, and because this meant there was no way to discover where the root level of the working tree was, so we needed to add $GIT_WORK_TREE to tell git where it was. However, this facility has long been (mis)used by people's scripts to start git from a working tree _with_ an embedded .git directory, let git find .git directory, and then pretend as if an unrelated directory were the associated working tree of the .git directory found by the discovery process. It happens to work in simple cases, and is not worth causing "regression" to these scripts. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Documentation: do not treat reset --keep as a special case

2011-01-21T20:41:14Z

The current treatment of "git reset --keep" emphasizes how it differs from --hard (treatment of local changes) and how it breaks down into plumbing (git read-tree -m -u HEAD followed by git update-ref HEAD ). This can discourage people from using it, since it might seem to be a complex or niche option. Better to emphasize what the --keep flag is intended for --- moving the index and worktree from one commit to another, like "git checkout" would --- so the reader can make a more informed decision about the appropriate situations in which to use it. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Correctly report corrupted objects

2011-01-20T21:18:51Z

The errno check added in commit 3ba7a06 "A loose object is not corrupt if it cannot be read due to EMFILE" only checked for whether errno is not ENOENT and thus incorrectly treated "no error" as an error condition. Because of that, it never reached the code path that would report that the object is corrupted and instead caused funny errors like: fatal: failed to read object 333c4768ce595793fdab1ef3a036413e2a883853: Success So we have to extend the check to cover the case in which the object file was successfully read, but its contents are corrupted. Reported-by: Will Palmer Signed-off-by: BjÃ¶rn Steinbrink Signed-off-by: Junio C Hamano

tests: compress the setup tests

2011-01-19T18:27:16Z

New test helpers: - setup_repo, to initialize a repository or gitfile pointing to a repository, with core.bare and core.worktree set as specified; - try_case, to run setup from a given directory and validate the result, with GIT_DIR and GIT_WORK_TREE set as specified; - try_repo, to initialize a repository and call "try_case" from the toplevel and a subdirectory; - run_wt_tests, to run a battery of tests that check for sane behavior when GIT_WORK_TREE is set to various positions relative to the .git dir and cwd. Use these helpers to make the test shorter, less repetitive, and (one hopes) easier to understand and modify. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

tests: cosmetic improvements to the repo-setup test

2011-01-19T18:27:16Z

Give an overview in "sh t1510-repo-setup.sh --help" output. Waste some vertical and horizontal space for clearer code. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano