AgeCommit message (Collapse)Author
2005-05-17Add silly "git-whatchanged" script.Linus Torvalds
It's a one-liner, but it's useful as documentation if nothing else.
2005-05-15[PATCH 4/4] Trivial test harness fixes.Junio C Hamano
The documentation of the test harness still refer to old numbering and also contains an obvious typo. Also "make test" should be run after making sure we have built all binaries, since test is designed to test the newly built ones. Signed-off-by: Junio C Hamano <> Signed-off-by: Petr Baudis <>
2005-05-15Remove obsolete note about native CPU byte formatPetr Baudis
Comment in entry.h said that the cache contents is in the native CPU byte format, which is really not true anymore for quite some time.
2005-05-15Rename some more cache-related functionsBrad Roberts
same_name -> ce_same_name() remove_entry_at() -> remove_cache_entry_at() Signed-off-by: Brad Roberts <> Signed-off-by: Petr Baudis <>
2005-05-15Rename cache_match_stat() to ce_match_stat()Brad Roberts
Signed-off-by: Brad Roberts <> Signed-off-by: Petr Baudis <>
2005-05-15Cleanup the x-allocation functionsBrad Roberts
xmalloc() and xrealloc() now take their sizes as size_t-type arguments. Introduced complementary xcalloc(). Signed-off-by: Brad Roberts <> Signed-off-by: Petr Baudis <>
2005-05-15[PATCH 3/3] Rename git-diff-tree-helper to git-diff-helper (part 2).Junio C Hamano
It used to be that diff-tree needed helper support to parse its raw output to generate diffs, but these days git-diff-* family produces the same output and the helper is not tied to diff-tree anymore. Drop "tree" from its name. This follows the "rename only" commit to adjust the contents of the files involved. Signed-off-by: Junio C Hamano <> Signed-off-by: Petr Baudis <>
2005-05-15[PATCH 2/3] Rename git-diff-tree-helper to git-diff-helper.Junio C Hamano
It used to be that diff-tree needed helper support to parse its raw output to generate diffs, but these days git-diff-* family produces the same output and the helper is not tied to diff-tree anymore. Drop "tree" from its name. This commit is done separately to record just the rename and no file content changes. The changes in the renamed files are recorded in the next commit. Signed-off-by: Junio C Hamano <> Bundled with the changes in the unrenamed files. Signed-off-by: Petr Baudis <>
2005-05-15The test of the basic diff functionalityJunio C Hamano
This test comes from "[PATCH 2/2] The core GIT tests: recent additions and fixes" but couldn't be included before since it depended on the modechange diff output changes. Signed-off-by: Junio C Hamano <> Signed-off-by: Petr Baudis <>
2005-05-14[PATCH 1/3] Update mode-change strings in diff output.Junio C Hamano
This updates the mode change strings to be a bit more machine friendly. Although this might go against the spirit of readability for human consumption, these mode bits strings are shown only when unusual things (mode change, file creation and deletion) happens, output normalized for machine consumption would be permissible. Signed-off-by: Junio C Hamano <> Signed-off-by: Petr Baudis <>
2005-05-14[PATCH] Add the merge test Linus called "test script from hell".Junio C Hamano
This is an adaptation to the test framework of a historic test that was used before three way merge form of read-tree was introduced, and subsequently used to validate the read-tree -m merge works correctly. It covers all the tricky cases known back then and also have been updated to cover conflicting files/directories cases since then. Signed-off-by: Junio C Hamano <> Signed-off-by: Petr Baudis <>
2005-05-14Fixed misnamed t/t2010-update-cache-badpath.shPetr Baudis
mv t/ t/
2005-05-14[PATCH] Test GIT environment use.Junio C Hamano
This test makes sure that use of deprecated environment variables still works, using both new and old names makes new one take precedence, and GIT_DIR and GIT_ALTERNATE_OBJECT_DIRECTORIES mechanisms work. Signed-off-by: Junio C Hamano <> Signed-off-by: Petr Baudis <>
2005-05-14Rename some test scripts and describe the naming conventionPetr Baudis
First digit: "family", e.g. the absolute basics and global stuff (0), the basic db-side commands (read-tree, write-tree, commit-tree), the basic working-tree-side commands (checkout-cache, update-cache), the other basic commands (ls-files), the diff commands, the pull commands, exporting commands, revision tree commands... Second digit: the particular command we are testing Third digit: (optionally) the particular switch or group of switches we are testing Freeform part: commandname-details Described in the README. mv mv mv mv mv
2005-05-14[PATCH 2/2] Test framework documentation.Junio C Hamano
This adds instruction for running tests, and writing new tests. Signed-off-by: Junio C Hamano <> Updated to the new tidied up output style. Signed-off-by: Petr Baudis <>
2005-05-14[PATCH 1/2] Test suite fixup.Junio C Hamano
Exposing test_expect_success and test_expect_failure turns out to be enough for the test scripts and there is no need for exposing test_ok or test_failure. This patch cleans it up and fixes the users of test_ok and test_failure. Also test scripts have acquired a new command line flag '--immediate' to cause them to exit upon the first failure. This is useful especially during the development of a new test. Signed-off-by: Junio C Hamano <> Signed-off-by: Petr Baudis <>
2005-05-14Try to make test output look betterPetr Baudis
NO changed to FAIL and ok was right-aligned with it so that it is easier to visually identify the failed tests, and the removal of # should reduce the clutter on the line and aid the eye to spot the test number better.
2005-05-14t/Makefile: OPTS -> GIT_TEST_OPTSPetr Baudis
This way, passing this variable through the environment actually makes sense.
2005-05-14t/Makefile cleanupPetr Baudis
t/Makefile now does not use double-colon rules (why would it?), the rm -fr trash in the all rule is silent, and OPTS aren't set to blank so that they can be taken from the environment.
2005-05-14Implemented make testPetr Baudis
make test in project root will recurse to the t/ subdirectory and run make all there.
2005-05-14Fixed and permissionsPetr Baudis
The +x bit was missing. I applied the original patch three times and set the permissions correctly two times. Guess which was the time I forgot.
2005-05-14[PATCH 2/2] The core GIT tests: recent additions and fixes.Junio C Hamano
This set of scripts are designed to test the features and fixes we recently added to core GIT. The convention to call test helper function has been changed during the framework cleanup (take two), and these tests have been updated to use the cleaned up interface. Signed-off-by: Junio C Hamano <> Note that this does not include the script since it tests a patch which was not applied yet. Signed-off-by: Petr Baudis <>
2005-05-14[PATCH 1/2] Test framework take two.Junio C Hamano
This adds t/ directory to host test suite, a test helper library and a basic set of tests. Petr Baudis raised many valid points at the earlier attempts in git mailing list. This round, has been updated to a bit more modern style, and the default output is made easier to read. Also included is one sample test script that tests the very basics. This test has already found one leftover bug missed when we introduced symlink support, which has been fixed since then. The supplied Makefile is designed to run all the available tests. Signed-off-by: Junio C Hamano <> Signed-off-by: Petr Baudis <>
2005-05-13[PATCH] Fix git-diff-files for symlinks.Junio C Hamano
Again I am not sure why this was missed during the last round, but git-diff-files mishandles symlinks on the filesystem. This patch fixes it. Signed-off-by: Junio C Hamano <> And I'm not sure why did I miss this patch before. Sorry. Signed-off-by: Petr Baudis <>
2005-05-13The Makefile is now aware of Documentation/ include directivesDavid Greaves
It makes the includers (diff commands documentation) depend on the includee (diff format description). Signed-off-by: David Greaves <> Signed-off-by: Petr Baudis <>
2005-05-13[PATCH 3/3] Add git-ls-files -k.Junio C Hamano
When checkout-cache attempts to check out a non-directory where a directory exists on the work tree, or to check out a file under directory D when path D is a non-directory on the work tree, the attempt fails. Before running checkout-cache, the user can run git-ls-files with the -k (killed) option to get a list of such paths. The tagged output format uses "K" to denote them. This is useful for Porcelain layer to be careful when dealing with the recently corrected behaviour of checkout-cache. Signed-off-by: Junio C Hamano <> Signed-off-by: Petr Baudis <>
2005-05-13[PATCH 2/3] Support symlinks in git-ls-files --others.Junio C Hamano
It is kind of surprising that this was missed in the last round, but the work tree scanner in git-ls-files was still deliberately ignoring symlinks. This patch fixes it, so that --others will correctly report unregistered symlinks. Signed-off-by: Junio C Hamano <> Signed-off-by: Petr Baudis <>
2005-05-12[PATCH] checkout-cache fixJunio C Hamano
Fix checkout-cache when existing work tree interferes with the checkout. This is essentially the same one as the last one I sent to the GIT list, except that the patch is rebased to the current tip of the git-pb tree, and an unnecessary call to create_directories() removed. The checkout-cache command gets confused when checking out a file in a subdirectory and the work tree has a symlink to the subdirectory. Also it fails to check things out when there is a non-directory in the work tree when cache expects a directory there, and vice versa. This patch fixes the first problem by making sure all the leading paths in the file being checked out are indeed directories, and also fixes directory vs non-directory conflicts when '-f' is specified by removing the offending paths. Signed-off-by: Junio C Hamano <> Signed-off-by: Petr Baudis <>
2005-05-11Fixed a leak in read-treePetr Baudis
unpack_tree() would not free the tree object it has read.
2005-05-11[patch] git: cleanup in ls-tree.cIngo Molnar
cleanup: this patch adds a free() to ls-tree.c. (Technically it's not a memory leak yet because the buffer is allocated once by the function and then the utility exits - but it's a tad cleaner to not leave such assumptions in the code, so that if someone reuses the function (or extends the utility to include a loop) the uncleanliness doesnt develop into a real memory leak.) Signed-off-by: Ingo Molnar <> Forward-ported. Signed-off-by: Petr Baudis <>
2005-05-11[patch] git: fix memory leak #2 in checkout-cache.cIngo Molnar
this patch fixes another (very rare) memory leak in checkout-cache. Signed-off-by: Ingo Molnar <> Signed-off-by: Petr Baudis <>
2005-05-11rev-tree now handles commit problems betterPetr Baudis
This fixes possible crashes in case of broken commit tree, and makes rev-tree die in case it cannot parse a given commit.
2005-05-11[PATCH] read_tree_recursive(): Fix leaksJonas Fonseca
Fix two potential leaks. Signed-off-by: Jonas Fonseca <> Signed-off-by: Petr Baudis <>
2005-05-11Stick a comment to update-cache.c:refresh_cache() that you can'tPetr Baudis
just free(archive_cache[i]) when replacing it there.
2005-05-11[patch] git: fix overflow in update-cache.cIngo Molnar
this patch fixes a 1-byte overflow in update-cache.c (probably not exploitable). A specially crafted db object might trigger this overflow. the bug is that normally the 'type' field is parsed by read_sha1_file(), via: if (sscanf(buffer, "%10s %lu", type, size) != 2) i.e. 0-10 long strings, which take 1-11 bytes of space. Normally the type strings are stored in char [20] arrays, but in update-cache.c that is char [10], so a 1 byte overflow might occur. This should not happen with a 'friendly' DB, as the longest type string ("commit") is 7 bytes long. The fix is to use the customary char [20]. (someone might want to clean those open-coded constants up with a TYPE_LEN define, they do tend to cause problems like this. I'm not against open-coded constants (they make code much more readable), but for fields that get filled in from possibly hostile objects this is playing with fire.) hey, this might be the first true security fix for GIT? ;-) Signed-off-by: Ingo Molnar <> Signed-off-by: Petr Baudis <>
2005-05-11Make update-cache be explicit about failed open() when doingPetr Baudis
2005-05-11Adjust quoting styles for some environment variables in the documentation.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-05-11Document git-merge-cache -oPetr Baudis
2005-05-11git-merge-cache -o does all the automerges in a single shotPetr Baudis
When you pass git-merge-cache the -o option, it tries to do all the automatic merges and possibly return error if any of them failed, instead of the default behaviour of failing immediately after the first failed automatic merge. Ported from the Cogito branch - Cogito needs this behaviour.
2005-05-11More README spelling fixesPetr Baudis
Two other README spelling fixes. I wasn't able to pinpoint the relevant commit in the cogito branch, but they are fairly trivial anyway.
2005-05-11Spelling fixes in README.Zack Brown
Signed-off-by: Zack Brown <> Signed-off-by: Petr Baudis <>
2005-05-11[PATCH] Misc fixes for git-paskyPavel Roskin
* README: spell checked Signed-off-by: Pavel Roskin <> Few more s/ie/i.e./ fixes. Signed-off-by: Petr Baudis <>
2005-05-11Merge with Baudis
2005-05-10Mark the variable declarations in .h files as externPetr Baudis
This allows git to be built even with linkers which are not smart enough to join those symbols, and makes this correct C. Pointed out by several people.
2005-05-10[PATCH 4/4] split core-git.txt and updateDavid Greaves
Makefile for html and man Signed-off-by: David Greaves <>
2005-05-10[PATCH 3/4] split core-git.txt and updateDavid Greaves
Update git environment variable docs Update first section of command docs (Manipulation commands section) Signed-off-by: David Greaves <>
2005-05-10[PATCH 2/4] split core-git.txt and updateDavid Greaves
Rearrange commands in git.txt Signed-off-by: David Greaves <>
2005-05-10[PATCH 1/4] split core-git.txt and updateDavid Greaves
Split the core-git.txt file Formatting fix to the diff-format.txt Signed-off-by: David Greaves <>
2005-05-10Link with -lcrypto instead of -lssl when using openssl libraries.Junio C Hamano
Mark Allen had trouble with building GIT on his Darwin and posted a patch to link with -lcrypto instead of -lssl on Darwin. Later Daniel Barkalow suggested to change it for everybody who uses openssl, because the relevant functionality is in -lcrypto not in -lssl, and the current linking happens to work only because -lssl pulls in -lcrypto. Signed-off-by: Junio C Hamano <>
2005-05-10Do not report size of the object that cannot be written in local-pull.cJunio C Hamano
Reporting st.st_size with %ld is simply wrong, as H Peter Anvin says. No other pull drivers report the failure with size anyway, so yank it out. This is a cop-out patch but should be good enough. Signed-off-by: Junio C Hamano <>