aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Collapse)AuthorAge
* Merge branch 'js/mv'Junio C Hamano2006-07-30
|\ | | | | | | | | | | | | * js/mv: builtin git-mv: support moving directories Make git-mv a builtin Extract helper bits from c-merge-recursive work
| * builtin git-mv: support moving directoriesJohannes Schindelin2006-07-26
| | | | | | | | | | | | | | | | | | | | This fixes the builtin mv for the test which Josef provided, and also fixes moving directories into existing directories, as noted by Jon Smirl. In case the destination exists, fail early (this cannot be overridden by -f). Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Display an error from update-ref if target ref name is invalid.Shawn Pearce2006-07-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex Riesen (raa.lkml@gmail.com) recently observed that git branch would fail with no error message due to unexpected situations with regards to refs. For example, if .git/refs/heads/gu is a file but "git branch -b refs/heads/gu/fixa HEAD" was invoked by the user it would fail silently due to refs/heads/gu being a file and not a directory. This change adds a test for trying to create a ref within a directory that is actually currently a file, and adds error printing within the ref locking routine should the resolve operation fail. The error printing code probably belongs at this level of the library as other failures within the ref locking, writing and logging code are also currently at this level of the code. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | t4103: fix binary patch application test.Junio C Hamano2006-07-28
| | | | | | | | | | | | | | | | | | The generated binary patch was _not_ binary -- earlier I made the --full-index flag to imply binary patch generation to the diff machinery, but later we made it independent from --binary (although the latter implies the former). Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Teach git-apply about '-R'Johannes Schindelin2006-07-28
|/ | | | | Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* t7001: add test for git-mv dir1 dir2/Johannes Schindelin2006-07-26
| | | | | | | | If dir2 already exists, git-mv should move dir1 _into_dir2/. Noticed by Jon Smirl. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* t4112: simplify the test and remove unneeded working tree file.Junio C Hamano2006-07-26
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Extend testing git-mv for renaming of subdirectoriesJosef Weidendorfer2006-07-26
| | | | | Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'ew/apply'Junio C Hamano2006-07-25
|\ | | | | | | | | | | | | | | | | * ew/apply: Fix t4114 on cygwin apply: handle type-changing patch correctly. apply: split out removal and creation into different phases. apply: check D/F conflicts more carefully. typechange tests for git apply (currently failing)
| * typechange tests for git apply (currently failing)Eric Wong2006-07-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've found that git apply is incapable of handling patches involving object type changes to the same path. Of course git itself is perfectly capable of making commits that generate these changes, as it only tracks trees states. It's just that the diffs between them are less useful if they can't be applied. Some of these are rare, but I've hit one of them (file becoming a symlink) recently in real-world usage, and was inspired to find more potential breakages :) I'm not sure when I'll have time to fix these myself and I'm not very familiar with the apply code. So if someone could get some or all of these cases working, they would be my hero :) Some of these are what I would refer to as corner-cases from hell. Most (if not all) other systems fail some of these. In fact, they aren't even capable of representing most of these changes in their histories; much less being able to handle patches to that effect. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Trivial path optimization testAlex Riesen2006-07-24
|/ | | | | | | | | | | | | | Linus: get_pathspec() does turn '.' into an empty string (which is correct - git internally does _not_ ever understand the notion of "." as the current working directory), but it doesn't ever do the optimization of noticing that a pathspec that consists solely of an empty string is "equivalent" to an empty pathspec. The test is to ensure that this behaviour stays. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Adjust t4013 tests to corrected format-patch.Junio C Hamano2006-07-13
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* t4013 diff format tests updateJunio C Hamano2006-07-13
| | | | | | | | | | This changes one test commit in the sequence to have more than one lines of commit log. A few output formats (--pretty=email aka format-patch and --pretty=oneline) need to behave differently on single and multi-line log, and this change will help catching breakages. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'ml/trace'Junio C Hamano2006-07-12
|\ | | | | | | | | | | | | * ml/trace: test-lib: unset GIT_TRACE GIT_TRACE: fix a mixed declarations and code warning GIT_TRACE: show which built-in/external commands are executed
| * test-lib: unset GIT_TRACEJunio C Hamano2006-07-12
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'js/merge-base'Junio C Hamano2006-07-12
|\ \ | | | | | | | | | | | | | | | * js/merge-base: Additional merge-base tests (revised) merge-base: update the clean-up postprocessing
| * | Additional merge-base tests (revised)A Large Angry SCM2006-07-09
| |/ | | | | | | Signed-off-by: A Large Angry SCM <gitzilla@gmail.com>
* | tests: Set EDITOR=: and VISUAL=: globallyEric Wong2006-07-11
| | | | | | | | | | | | | | | | | | This way we don't have to remember to set it for each test; and if we forget, we won't cause interactive editors to be spawned for non-interactive tests. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Record the type of commit operation in the reflog.Shawn Pearce2006-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If committing a merge (.git/MERGE_HEAD exists), an initial tree (no HEAD) or using --amend to amend the prior commit then denote the subtype of commit in the reflog. This helps to distinguish amended or merge commits from normal commits. In the case of --amend the prior sha1 is probably the commit which is being thrown away in favor of the new commit. Since it is likely that the old commit doesn't have any ref pointing to it anymore it can be interesting to know why that the commit was replaced and orphaned. In the case of a merge the prior sha1 is probably the first parent of the new merge commit. Consequently having its prior sha1 in the reflog is slightly less interesting but its still informative to know the commit was the result of a merge which had to be completed by hand. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix more typos, primarily in the codePavel Roskin2006-07-10
| | | | | | | | | | | | | | | | | | The only visible change is that git-blame doesn't understand "--compability" anymore, but it does accept "--compatibility" instead, which is already documented. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-svn: migrate out of contrib (follow-up)Junio C Hamano2006-07-07
| | | | | | | | | | | | | | | | Check for SVN::Core so test 910[45] don't fail if the user doesn't have those installed. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-svn: migrate out of contribEric Wong2006-07-06
|/ | | | | | | | | Allow NO_SVN_TESTS to be defined to skip git-svn tests. These tests are time-consuming due to SVN being slow, and even more so if SVN Perl libraries are not available. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'jc/fmt-merge-msg-test'Junio C Hamano2006-07-05
|\ | | | | | | | | * jc/fmt-merge-msg-test: t6200: fmt-merge-msg test.
| * t6200: fmt-merge-msg test.Junio C Hamano2006-07-03
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'jc/diff-test'Junio C Hamano2006-07-05
|\ \ | | | | | | | | | | | | * jc/diff-test: t4013: add "diff" UI program tests.
| * | t4013: add "diff" UI program tests.Junio C Hamano2006-07-01
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'th/diff'Junio C Hamano2006-07-05
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * th/diff: builtin-diff: turn recursive on when defaulting to --patch format. t4013: note improvements brought by the new output code. t4013: add format-patch tests. format-patch: fix diff format option implementation combine-diff.c: type sanity. t4013 test updates for new output code. Fix some more diff options changes. Fix diff-tree -s log --raw: Don't descend into subdirectories by default diff-tree: Use ---\n as a message separator Print empty line between raw, stat, summary and patch t4013: add more tests around -c and --cc whatchanged: Default to DIFF_FORMAT_RAW Don't xcalloc() struct diffstat_t Add msg_sep to diff_options DIFF_FORMAT_RAW is not default anymore Set default diff output format after parsing command line Make --raw option available for all diff commands Merge with_raw, with_stat and summary variables to output_format t4013: add tests for diff/log family output options.
| * | | t4013: note improvements brought by the new output code.Junio C Hamano2006-06-29
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Merge branch 'jc/diff-test' into jc/diff-test-updatesJunio C Hamano2006-06-29
| |\ \ \ | | |/ / | | | | | | | | | | | | * jc/diff-test: t4013: add format-patch tests.
| | * | t4013: add format-patch tests.Junio C Hamano2006-06-29
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | t4013 test updates for new output code.Junio C Hamano2006-06-27
| |/ / | | | | | | | | | | | | | | | | | | | | | These are updates to the test vector that shows the "incompatibility" of the new output code. The changes are actually the good ones, so instead of keeping the older output we adjust the test to the new code. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | t4013: add more tests around -c and --ccJunio C Hamano2006-06-26
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | t4013: add tests for diff/log family output options.Junio C Hamano2006-06-26
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | t8001-annotate: fix a bash-ism in this testEric Wong2006-07-04
| |/ |/| | | | | | | Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | send-email: do not barf when Term::ReadLine does not like your terminalJunio C Hamano2006-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | As long as we do not need to readline from the terminal, we should not barf when starting up the program. Without this patch, t9001 test on Cygwin occasionally died with the following error message: Unable to get Terminal Size. The TIOCGWINSZ ioctl didn't work. The COLUMNS and LINES environment variables didn't work. The resize program didn't work. at /usr/lib/perl5/vendor_perl/5.8/cygwin/Term/ReadKey.pm line 362. Compilation failed in require at /usr/lib/perl5/vendor_perl/5.8/Term/ReadLine/Perl.pm line 58. Acked-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | annotate: Support annotation of files on other revisions.Ryan Anderson2006-07-03
| | | | | | | | | | | | | | | | | | | | | | This is a bug fix, and cleans up one or two other things spotted during the course of tracking down the main bug here. Also, the test-suite is updated to reflect this case. Signed-off-by: Ryan Anderson <ryan@michonline.com> (cherry picked from 2f7554b4db3ab2c2d3866b160245c91c9236fc9a commit) Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'js/patch'Junio C Hamano2006-06-28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * js/patch: diff.c: fix get_patch_id() t4014: fix test commit labels. format-patch: use clear_commit_marks() instead of some ad-hockery t4014: fix for whitespace from "wc -l" t4014: add format-patch --ignore-if-in-upstream test format-patch: introduce "--ignore-if-in-upstream" add diff_flush_patch_id() to calculate the patch id
| * | t4014: fix test commit labels.Junio C Hamano2006-06-28
| | | | | | | | | | | | | | | | | | | | | | | | The commit tag and commit comments used in the test claimed that the #1 commit was merged upstream where the test actually let the upstream merge #2 commit. Fix them. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | t4014: fix for whitespace from "wc -l"Johannes Schindelin2006-06-27
| | | | | | | | | | | | | | | | | | | | | Some "wc" insist on putting a TAB in front of the number. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | t4014: add format-patch --ignore-if-in-upstream testJunio C Hamano2006-06-26
| |/ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | checkout -m: fix read-tree invocationv1.4.1-rc2Junio C Hamano2006-06-28
| | | | | | | | | | | | | | | | When we updated "read-tree -m -u" to be careful about not removing untracked working tree files, we broke "checkout -m" to switch between branches. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | t/README: start testing porcelainishJunio C Hamano2006-06-28
|/ | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* rebase: allow --skip to work with --mergeEric Wong2006-06-25
| | | | | | | | | | Now that we control the merge base selection, we won't be forced into rolling things in that we wanted to skip beforehand. Also, add a test to ensure this all works as intended. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* rebase: allow --merge option to handle patches merged upstreamEric Wong2006-06-25
| | | | | | | | Enhance t3401-rebase-partial to test with --merge as well as the standard am -3 strategy. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'ew/rebase' into nextJunio C Hamano2006-06-21
|\ | | | | | | | | | | | | | | * ew/rebase: rebase: error out for NO_PYTHON if they use recursive merge Add renaming-rebase test. rebase: Allow merge strategies to be used when rebasing object-refs: avoid division by zero
| * rebase: error out for NO_PYTHON if they use recursive mergeEric Wong2006-06-21
| | | | | | | | | | | | | | | | | | | | | | | | recursive merge relies on Python, and we can't perform rename-aware merges without the recursive merge. So bail out before trying it. The test won't work w/o recursive merge, either, so skip that, too. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Add renaming-rebase test.Junio C Hamano2006-06-21
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'lt/objlist' into nextJunio C Hamano2006-06-19
|\ \ | |/ | | | | | | | | | | | | | | * lt/objlist: Add "named object array" concept xdiff: minor changes to match libxdiff-0.21 fix rfc2047 formatter. Fix t8001-annotate and t8002-blame for ActiveState Perl Add specialized object allocator
| * Fix t8001-annotate and t8002-blame for ActiveState PerlDennis Stosberg2006-06-19
| | | | | | | | | | | | | | | | | | | | There seems to be at least one implementation of Perl which requires the user to specify an extension for backup files. Reported by Alex Riesen. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix setting config variables with an alternative GIT_CONFIGJohannes Schindelin2006-06-19
|/ | | | | | | | | | | | | When setting a config variable, git_config_set() ignored the variables GIT_CONFIG and GIT_CONFIG_LOCAL. Now, when GIT_CONFIG_LOCAL is set, it will write to that file. If not, GIT_CONFIG is checked, and only as a fallback, the change is written to $GIT_DIR/config. Add a test for it, and also future-proof the test for the upcoming $HOME/.gitconfig support. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-22 01:31:22 +0000