AgeCommit message (Collapse)Author
2012-09-24commit: pay attention to submodule.$name.ignore in .gitmodulesOrgad Shaneh
"git status" does not list a submodule with uncommitted working tree files as modified when "submodule.$name.ignore" is set to "dirty" in in-tree ".gitmodules" file. Both status and commit honor the setting in $GIT_DIR/config, but "commit" does not pick it up from .gitmodules, which is inconsistent. Teach "git commit" to pay attention to the setting in .gitmodules as well. Signed-off-by: Orgad Shaneh <> Signed-off-by: Junio C Hamano <>
2010-09-18Git 1.7.3v1.7.3Junio C Hamano
Signed-off-by: Junio C Hamano <>
2010-09-18Merge branch 'js/ls-files-x-doc'Junio C Hamano
* 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 replace cut with ${v%% *}Chris Johnsen
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 <> Signed-off-by: Junio C Hamano <>
2010-09-17t/t7300: workaround ancient touch by rearranging argumentsBrandon Casey
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 <> Signed-off-by: Junio C Hamano <>
2010-09-16Merge branch 'bg/fix-t7003'Junio C Hamano
* bg/fix-t7003: t7003: Use test_commit instead of custom function
2010-09-16ls-files documentation: reword for consistencyJunio C Hamano
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 <>
2010-09-16git-ls-files.txt: clarify -x/--exclude optionJay Soffian
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 <> Signed-off-by: Junio C Hamano <>
2010-09-15Git 1.7.3 rc2v1.7.3-rc2Junio C Hamano
2010-09-15Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'Junio C Hamano
* dr/maint-ls-tree-prefix-recursion-fix: ls-tree $di $dir: do not mistakenly recurse into directories
2010-09-15Merge branch 'os/fix-rebase-diff-no-prefix'Junio C Hamano
* os/fix-rebase-diff-no-prefix: Add --src/dst-prefix to git-formt-patch in
2010-09-15Merge branch 'jl/fix-test'Junio C Hamano
* 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
2010-09-15Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'Junio C Hamano
* ch/filter-branch-deprecate-remap-to-ancestor: filter-branch: retire --remap-to-ancestor
2010-09-15Merge branch 'ch/maint-cannot-create-bundle-error'Junio C Hamano
* ch/maint-cannot-create-bundle-error: bundle: detect if bundle file cannot be created
2010-09-15Merge branch 'ks/recursive-rename-add-identical'Junio C Hamano
* ks/recursive-rename-add-identical: RE: [PATCH] Avoid rename/add conflict when contents are identical
2010-09-15Merge git:// C Hamano
* 'master' of git:// 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.
2010-09-14git-gui 0.13gitgui-0.13.0Pat Thoyts
Signed-off-by: Pat Thoyts <>
2010-09-13git-gui: avoid mis-encoding the copyright message on Windows.Pat Thoyts
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 <>
2010-09-13git-gui: Update Swedish translation (521t).Peter Krefting
Signed-off-by: Peter Krefting <> Signed-off-by: Pat Thoyts <>
2010-09-13t7003: Use test_commit instead of custom functionBrian Gernhardt had a make_commit() function that was identical to test_commit() in except that it used tr to create a lowercase file name from the uppercase branch name instead of appending ".t". Not only is this unneeded code duplication, it also was something simply waiting to fail on case-insensitive file systems. So replace all uses of make_commit with test_commit. While we're editing the setup, chain it together with && so that failures early in the sequence don't get lost and add a commit graph. Signed-off-by: Brian Gernhardt <> Signed-off-by: Junio C Hamano <>
2010-09-12Merge branch 'maint'Junio C Hamano
* maint: t3101: modernise style compat/nedmalloc: don't force NDEBUG on the rest of git Conflicts: Makefile
2010-09-12ls-tree $di $dir: do not mistakenly recurse into directoriesJunio C Hamano
When applying two pathspecs, one of which is named as a prefix to the other, we mistakenly recursed into the shorter one. Noticed and fixed by David Reis. Signed-off-by: Junio C Hamano <>
2010-09-12t3101: modernise styleJunio C Hamano
Also add a few " &&" cascade that were missing. Signed-off-by: Junio C Hamano <>
2010-09-12vcs-svn: Fix some printf format compiler warningsRamsay Jones
In particular, on systems that define uint32_t as an unsigned long, gcc complains as follows: CC vcs-svn/fast_export.o vcs-svn/fast_export.c: In function `fast_export_modify': vcs-svn/fast_export.c:28: warning: unsigned int format, uint32_t arg (arg 2) vcs-svn/fast_export.c:28: warning: int format, uint32_t arg (arg 3) vcs-svn/fast_export.c: In function `fast_export_commit': vcs-svn/fast_export.c:42: warning: int format, uint32_t arg (arg 5) vcs-svn/fast_export.c:62: warning: int format, uint32_t arg (arg 2) vcs-svn/fast_export.c: In function `fast_export_blob': vcs-svn/fast_export.c:72: warning: int format, uint32_t arg (arg 2) vcs-svn/fast_export.c:72: warning: int format, uint32_t arg (arg 3) CC vcs-svn/svndump.o vcs-svn/svndump.c: In function `svndump_read': vcs-svn/svndump.c:260: warning: int format, uint32_t arg (arg 3) In order to suppress the warnings we use the C99 format specifier macros PRIo32 and PRIu32 from <inttypes.h>. Signed-off-by: Ramsay Jones <> Acked-by: Jonathan Nieder <> Signed-off-by: Junio C Hamano <>
2010-09-11compat/nedmalloc: don't force NDEBUG on the rest of gitRené Scharfe
Define the nedmalloc feature configuration macros for nedmalloc.o, only. This keeps assert(3) working for the rest of the git source; it was turned off for nedmalloc users before by defining NDEBUG globally. Also remove -DUSE_NED_ALLOCATOR as this macro isn't used anywhere. Signed-off-by: Rene Scharfe <> Signed-off-by: Junio C Hamano <>
2010-09-10Git 1.7.3 rc1v1.7.3-rc1Junio C Hamano
Signed-off-by: Junio C Hamano <>
2010-09-10Merge branch 'np/relnotes-in-subdir'Junio C Hamano
* np/relnotes-in-subdir: install-webdoc: keep installed RelNotes-*.txt Documentation: move RelNotes into a directory of their own
2010-09-10Prepare for 1.7.3 rc1Junio C Hamano
2010-09-10Merge branch 'maint'Junio C Hamano
* maint: config.txt: fix placement of diff.noprefix
2010-09-10config.txt: fix placement of diff.noprefixMark Lodato
In git-config(1), diff.noprefix was placed in between diff.mnemonicprefix and the list of mnemonic prefixes, which is obviously incorrect and very confusing to readers. Now, it is located after the end of the explanation of mnemonicprefix, which makes much more sense. Signed-off-by: Mark Lodato <> Signed-off-by: Junio C Hamano <>
2010-09-10t/t4018: avoid two unnecessary sub-shell invocationsBrandon Casey
Signed-off-by: Brandon Casey <> Signed-off-by: Junio C Hamano <>
2010-09-10Merge branch 'maint'Junio C Hamano
* maint: xdiff-interface.c: always trim trailing space from xfuncname matches diff.c: call regfree to free memory allocated by regcomp when necessary
2010-09-10t/t4018: test whether the word_regex patterns compileBrandon Casey
Previously (e3bf5e43), a test was added to test whether the builtin xfuncname regular expressions could be compiled without error by regcomp. Let's do the same for the word_regex patterns. This should help catch any cross-platform incompatibilities that exist between the pattern creator's system and the various platforms that the test suite is commonly run on. Signed-off-by: Brandon Casey <> Signed-off-by: Junio C Hamano <>
2010-09-10xdiff-interface.c: always trim trailing space from xfuncname matchesBrandon Casey
Generally, trailing space is removed from the string matched by the xfuncname patterns. The exception is when the matched string exceeds the length of the fixed-size buffer that it will be copied in to. But, a string that exceeds the buffer can still contain trailing space in the portion of the string that will be copied into the buffer. So, simplify this code slightly, and just perform the trailing space removal always. Signed-off-by: Brandon Casey <> Signed-off-by: Junio C Hamano <>
2010-09-10diff.c: call regfree to free memory allocated by regcomp when necessaryBrandon Casey
Signed-off-by: Brandon Casey <> Signed-off-by: Junio C Hamano <>
2010-09-10t/ improve testing with explicit URL and merge specBrandon Casey
Commit 6106ce46 introduced a test to demonstrate fetch's failure to retrieve any objects or update FETCH_HEAD when it was supplied a repository URL and the current branch had a configured merge spec. This commit expands the original test based on comments from Junio Hamano. In addition to actually verifying that the fetch updates FETCH_HEAD correctly, and does not update the current branch, two more tests are added to ensure that the merge configuration is ignored even when the supplied URL matches the URL of the remote configured for the branch. Signed-off-by: Brandon Casey <> Signed-off-by: Junio C Hamano <>
2010-09-10builtin/fetch.c: comment that branch->remote_name is usable when has_mergeBrandon Casey
Save future readers the trouble of tracing code to determine that the two uses of branch->remote_name are safe when has_merge is set, by adding a comment explaining that it is so. Signed-off-by: Brandon Casey <> Signed-off-by: Junio C Hamano <>
2010-09-10Makefile: use compat regex on IRIX 6.5Brandon Casey
The IRIX 6.5 regex.h header file defines REG_STARTEND, but the feature does not appear to work. Since REG_STARTEND is required for proper functioning of git-grep, set NO_REGEX and use the alternative regex libraries in compat/ Signed-off-by: Brandon Casey <> Signed-off-by: Junio C Hamano <>
2010-09-10t/t7008: workaround broken handling of \000 by printf on IRIXBrandon Casey
On IRIX 6.5, the printf utility in /usr/bin does not appear to handle the \ddd notation according to POSIX. This printf appears to halt processing of the string argument and ignore any additional characters in the string. Work around this flaw by replacing the \000's with 'Q' and using the q_to_nul helper function provided by This problem with printf is not apparent when using the Bash shell since Bash implements a POSIX compatible printf function internally. Signed-off-by: Brandon Casey <> Signed-off-by: Junio C Hamano <>
2010-09-10Add --src/dst-prefix to git-formt-patch in git-rebase.shOded Shimon
For the case of "diff.noprefix" in git-config, git-format-patch should still output diff with standard prefixes for git-am Signed-off-by: Oded Shimon <> Signed-off-by: Junio C Hamano <>
2010-09-09install-webdoc: keep installed RelNotes-*.txtJunio C Hamano
Otherwise URLs in the wild that point at older release notes will become dangling. Signed-off-by: Junio C Hamano <>
2010-09-09t1020: Get rid of 'cd "$HERE"' at the start of each testJens Lehmann
To achieve that, all cd commands which weren't inside a subshell had to be put into a new one. Signed-off-by: Jens Lehmann <> Signed-off-by: Junio C Hamano <>
2010-09-09t2016 (checkout -p): add missing &&Jonathan Nieder
Although the set_state command is not likely to fail, it is best to stay in the habit of checking for failures. Cc: Thomas Rast <> Signed-off-by: Jonathan Nieder <> Signed-off-by: Junio C Hamano <>
2010-09-09t1302 (core.repositoryversion): style tweaksJonathan Nieder
This test is from 2007, which is late enough for the style to be recognizably modern but still a while ago. Freshen it up to follow new best practices: - guard setup commands with test_expect_setup, so errors at that stage can be caught; - use <<\EOF in preference to <<EOF, to save reviewers the trouble of looking for variable interpolations; - use test_cmp instead of test "$foo" = "$bar", for better output with -v on failure; - indent commands in subshells and let them span multiple lines; - combine the two "gitdir required mode" tests that do not make as much sense alone. Cc: Nguyễn Thái Ngọc Duy <> Signed-off-by: Jonathan Nieder <> Signed-off-by: Junio C Hamano <>
2010-09-09t2105 (gitfile): add missing &&Jonathan Nieder
Make sure early failures are not masked by later successes. Signed-off-by: Jonathan Nieder <> Acked-by: Brad King <> Signed-off-by: Junio C Hamano <>
2010-09-09t1450 (fsck): remove dangling objectsJonathan Nieder
The fsck test is generally careful to remove the corrupt objects it inserts, but dangling objects are left behind due to some typos and omissions. It is better to clean up more completely, to simplify the addition of later tests. So: - guard setup and cleanup with test_expect_success to catch typos and errors; - check both stdout and stderr when checking for empty fsck output; - use test_cmp empty file in place of test $(wc -l <file) = 0, for better debugging output when running tests with -v; - add a remove_object () helper and use it to replace broken object removal code that forgot about the fanout in .git/objects; - disable, to avoid tripping up object removal if the number of objects ever reaches that threshold. - use test_when_finished to ensure cleanup tasks are run and succeed when tests fail; - add a new final test that no breakage or dangling objects was left behind. While at it, add a brief description to test_description of the history that is expected to persist between tests. Part of a campaign to clean up subshell usage in tests. Cc: Thomas Rast <> Signed-off-by: Jonathan Nieder <> Signed-off-by: Junio C Hamano <>
2010-09-09tests: subshell indentation stylefixJonathan Nieder
Format the subshells introduced by the previous patch (Several tests: cd inside subshell instead of around, 2010-09-06) like so: ( cd subdir && ... ) && This is generally easier to read and has the nice side-effect that this patch will show what commands are used in the subshell, making it easier to check for lost environment variables and similar behavior changes. Cc: Jens Lehmann <> Signed-off-by: Jonathan Nieder <> Signed-off-by: Junio C Hamano <>
2010-09-08Merge branch 'tf/cleanup-builtin-help-headers'Junio C Hamano
* tf/cleanup-builtin-help-headers: builtin.h: Move two functions definitions to help.h.
2010-09-08Merge branch 'jk/test-must-fail-missing'Junio C Hamano
* jk/test-must-fail-missing: tests: make test_might_fail fail on missing commands tests: make test_might_fail more verbose tests: make test_must_fail fail on missing commands tests: make test_must_fail more verbose
2010-09-08Merge branch 'jh/error-removing-missing-note'Junio C Hamano
* jh/error-removing-missing-note: notes: Don't create (empty) commit when removing non-existing notes