| 7e100ef | Junio C Hamano | 15 September 2010, 19:47:37 UTC | Git 1.7.3 rc2 | 15 September 2010, 19:47:37 UTC |
| 2e1e961 | Junio C Hamano | 15 September 2010, 19:41:13 UTC | Merge branch 'dr/maint-ls-tree-prefix-recursion-fix' * dr/maint-ls-tree-prefix-recursion-fix: ls-tree $di $dir: do not mistakenly recurse into directories | 15 September 2010, 19:41:13 UTC |
| 0c61c6d | Junio C Hamano | 15 September 2010, 19:40:33 UTC | Merge branch 'os/fix-rebase-diff-no-prefix' * os/fix-rebase-diff-no-prefix: Add --src/dst-prefix to git-formt-patch in git-rebase.sh | 15 September 2010, 19:40:33 UTC |
| e3f213c | Junio C Hamano | 15 September 2010, 19:40:12 UTC | Merge branch 'jl/fix-test' * 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 | 15 September 2010, 19:40:12 UTC |
| 43d268e | Junio C Hamano | 15 September 2010, 19:39:32 UTC | Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor' * ch/filter-branch-deprecate-remap-to-ancestor: filter-branch: retire --remap-to-ancestor | 15 September 2010, 19:39:32 UTC |
| d42cb58 | Junio C Hamano | 15 September 2010, 19:39:22 UTC | Merge branch 'ch/maint-cannot-create-bundle-error' * ch/maint-cannot-create-bundle-error: bundle: detect if bundle file cannot be created | 15 September 2010, 19:39:22 UTC |
| 9f0ccb5 | Junio C Hamano | 15 September 2010, 19:39:12 UTC | Merge branch 'ks/recursive-rename-add-identical' * ks/recursive-rename-add-identical: RE: [PATCH] Avoid rename/add conflict when contents are identical | 15 September 2010, 19:39:12 UTC |
| 12644fa | Junio C Hamano | 15 September 2010, 19:34:37 UTC | Merge git://repo.or.cz/git-gui * 'master' of git://repo.or.cz/git-gui: 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. | 15 September 2010, 19:34:48 UTC |
| 00e9de7 | Pat Thoyts | 14 September 2010, 21:42:37 UTC | git-gui 0.13 Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 14 September 2010, 21:42:37 UTC |
| 2473543 | Pat Thoyts | 13 September 2010, 19:41:42 UTC | git-gui: avoid mis-encoding the copyright message on Windows. 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 <patthoyts@users.sourceforge.net> | 13 September 2010, 19:41:42 UTC |
| 421a31e | Peter Krefting | 12 September 2010, 20:13:29 UTC | git-gui: Update Swedish translation (521t). Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 13 September 2010, 18:25:55 UTC |
| 5879b6b | Junio C Hamano | 12 September 2010, 20:53:03 UTC | Merge branch 'maint' * maint: t3101: modernise style compat/nedmalloc: don't force NDEBUG on the rest of git Conflicts: Makefile | 12 September 2010, 20:53:03 UTC |
| b294ed6 | Junio C Hamano | 11 September 2010, 18:47:09 UTC | ls-tree $di $dir: do not mistakenly recurse into directories 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 <gitster@pobox.com> | 12 September 2010, 20:52:03 UTC |
| e22148f | Junio C Hamano | 11 September 2010, 17:53:29 UTC | t3101: modernise style Also add a few " &&" cascade that were missing. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 September 2010, 20:46:58 UTC |
| 5418d96 | Ramsay Jones | 09 September 2010, 17:24:06 UTC | vcs-svn: Fix some printf format compiler warnings 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 <ramsay@ramsay1.demon.co.uk> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 September 2010, 17:24:55 UTC |
| d555ff5 | René Scharfe | 11 September 2010, 09:59:18 UTC | compat/nedmalloc: don't force NDEBUG on the rest of git 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 <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2010, 17:23:03 UTC |
| 3b3a8ed | Junio C Hamano | 10 September 2010, 18:55:55 UTC | Git 1.7.3 rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2010, 18:55:55 UTC |
| 5b45c55 | Junio C Hamano | 10 September 2010, 18:54:58 UTC | Merge branch 'np/relnotes-in-subdir' * np/relnotes-in-subdir: install-webdoc: keep installed RelNotes-*.txt Documentation: move RelNotes into a directory of their own | 10 September 2010, 18:54:58 UTC |
| 6070bac | Junio C Hamano | 10 September 2010, 18:54:34 UTC | Prepare for 1.7.3 rc1 | 10 September 2010, 18:54:34 UTC |
| 9ab5a33 | Junio C Hamano | 10 September 2010, 16:39:08 UTC | Merge branch 'maint' * maint: config.txt: fix placement of diff.noprefix | 10 September 2010, 16:39:08 UTC |
| 9904fad | Mark Lodato | 10 September 2010, 01:39:37 UTC | config.txt: fix placement of diff.noprefix 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 <lodatom@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2010, 16:31:13 UTC |
| 99f55eb | Brandon Casey | 10 September 2010, 16:13:38 UTC | t/t4018: avoid two unnecessary sub-shell invocations Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2010, 16:30:14 UTC |
| 8ac8cf5 | Junio C Hamano | 10 September 2010, 00:29:40 UTC | Merge branch 'maint' * maint: xdiff-interface.c: always trim trailing space from xfuncname matches diff.c: call regfree to free memory allocated by regcomp when necessary | 10 September 2010, 00:29:40 UTC |
| bff4206 | Brandon Casey | 09 September 2010, 19:02:47 UTC | t/t4018: test whether the word_regex patterns compile 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 <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2010, 00:19:18 UTC |
| 1b6ecba | Brandon Casey | 09 September 2010, 19:02:46 UTC | xdiff-interface.c: always trim trailing space from xfuncname matches 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 <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2010, 00:18:29 UTC |
| ef5644e | Brandon Casey | 09 September 2010, 19:02:45 UTC | diff.c: call regfree to free memory allocated by regcomp when necessary Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2010, 00:18:04 UTC |
| 042cca3 | Brandon Casey | 09 September 2010, 18:56:37 UTC | t/t5510-fetch.sh: improve testing with explicit URL and merge spec 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 <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2010, 00:16:08 UTC |
| f31dbdc | Brandon Casey | 09 September 2010, 18:56:36 UTC | builtin/fetch.c: comment that branch->remote_name is usable when has_merge 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 <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2010, 00:15:58 UTC |
| a1d558d | Brandon Casey | 09 September 2010, 19:15:58 UTC | Makefile: use compat regex on IRIX 6.5 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 <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2010, 00:11:06 UTC |
| f985487 | Brandon Casey | 09 September 2010, 19:15:57 UTC | t/t7008: workaround broken handling of \000 by printf on IRIX 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 test-lib.sh 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 <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2010, 00:11:06 UTC |
| 5b220a6 | Oded Shimon | 09 September 2010, 18:49:51 UTC | Add --src/dst-prefix to git-formt-patch in git-rebase.sh 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 <ods15@ods15.dyndns.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2010, 00:09:44 UTC |
| 3a4e6c7 | Junio C Hamano | 09 September 2010, 23:17:59 UTC | install-webdoc: keep installed RelNotes-*.txt Otherwise URLs in the wild that point at older release notes will become dangling. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 September 2010, 23:17:59 UTC |
| fd3c32c | Jens Lehmann | 07 September 2010, 10:29:20 UTC | t1020: Get rid of 'cd "$HERE"' at the start of each test 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 <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 September 2010, 23:03:11 UTC |
| a814615 | Jonathan Nieder | 07 September 2010, 08:22:53 UTC | t2016 (checkout -p): add missing && 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 <trast@student.ethz.ch> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 September 2010, 23:02:47 UTC |
| 8fe5aed | Jonathan Nieder | 07 September 2010, 01:52:27 UTC | t1302 (core.repositoryversion): style tweaks 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 <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 September 2010, 23:01:10 UTC |
| 76bbcd4 | Jonathan Nieder | 07 September 2010, 01:49:10 UTC | t2105 (gitfile): add missing && Make sure early failures are not masked by later successes. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Brad King <brad.king@kitware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 September 2010, 22:58:45 UTC |
| dbedf8b | Jonathan Nieder | 07 September 2010, 01:47:07 UTC | t1450 (fsck): remove dangling objects 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 gc.auto, 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 <trast@student.ethz.ch> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 September 2010, 22:58:32 UTC |
| 18a8269 | Jonathan Nieder | 07 September 2010, 01:42:54 UTC | tests: subshell indentation stylefix 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 <Jens.Lehmann@web.de> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 September 2010, 22:56:20 UTC |
| 154adcf | Junio C Hamano | 08 September 2010, 16:17:01 UTC | Merge branch 'tf/cleanup-builtin-help-headers' * tf/cleanup-builtin-help-headers: builtin.h: Move two functions definitions to help.h. | 08 September 2010, 16:17:01 UTC |
| 1080be2 | Junio C Hamano | 08 September 2010, 16:17:01 UTC | Merge branch 'jk/test-must-fail-missing' * 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 | 08 September 2010, 16:17:01 UTC |
| 1d86cb8 | Junio C Hamano | 08 September 2010, 16:17:01 UTC | Merge branch 'jh/error-removing-missing-note' * jh/error-removing-missing-note: notes: Don't create (empty) commit when removing non-existing notes | 08 September 2010, 16:17:01 UTC |
| b815a72 | Junio C Hamano | 08 September 2010, 16:17:01 UTC | Merge branch 'kf/askpass-config' * kf/askpass-config: Extend documentation of core.askpass and GIT_ASKPASS. Allow core.askpass to override SSH_ASKPASS. Add a new option 'core.askpass'. | 08 September 2010, 16:17:01 UTC |
| e250c59 | Junio C Hamano | 08 September 2010, 16:17:00 UTC | Merge branch 'bc/maint-fetch-url-only' * bc/maint-fetch-url-only: builtin/fetch.c: ignore merge config when not fetching from branch's remote t/t5510: demonstrate failure to fetch when current branch has merge ref | 08 September 2010, 16:17:00 UTC |
| 6b948a7 | Junio C Hamano | 08 September 2010, 16:17:00 UTC | Merge branch 'jk/maint-pass-c-config-in-env' * jk/maint-pass-c-config-in-env: do not pass "git -c foo=bar" params to transport helpers pass "git -c foo=bar" params through environment | 08 September 2010, 16:17:00 UTC |
| 9f44723 | Junio C Hamano | 08 September 2010, 15:54:01 UTC | Merge branch 'en/d-f-conflict-fix' * en/d-f-conflict-fix: fast-export: ensure that a renamed file is printed after all references | 08 September 2010, 15:54:01 UTC |
| 4ce6fb8 | Johannes Sixt | 07 September 2010, 19:33:02 UTC | fast-export: ensure that a renamed file is printed after all references t9350 sets up a commit where a file is both copied and renamed. The output of fast-export for this commit should look like this: author ... committer ... from :19 C "file2" "file4" R "file2" "file5" The order of the two modification lines is derived from the result that the diff machinery produces. 060df62 (fast-export: Fix output order of D/F changes) inserted a qsort call that modifies the order of the diff result. Unfortunately, qsort need not be stable. Therefore, it is possible that the 'R' line appears before the 'C' line and the resulting fast-import stream is incorrect. Fix it by forcing that the rename entry is printed after all other modification lines with the same file name. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 September 2010, 15:53:54 UTC |
| 761e742 | Nicolas Pitre | 07 September 2010, 00:29:57 UTC | Documentation: move RelNotes into a directory of their own There are 108 of them already. That's a bit more than one third of all the files in the Documentation directory already, and still growing. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 September 2010, 00:41:18 UTC |
| 7505ae2 | Junio C Hamano | 07 September 2010, 00:40:18 UTC | Merge branch 'maint' * maint: revert: Fix trivial comment style issue cache_tree_free: Fix small memory leak Conflicts: builtin/revert.c | 07 September 2010, 00:40:18 UTC |
| 04df568 | Elijah Newren | 06 September 2010, 21:53:24 UTC | revert: Fix trivial comment style issue Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 September 2010, 00:33:59 UTC |
| e92fa51 | Elijah Newren | 06 September 2010, 21:40:16 UTC | cache_tree_free: Fix small memory leak Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 September 2010, 00:32:28 UTC |
| 79d532c | Junio C Hamano | 06 September 2010, 23:57:05 UTC | Merge branch 'jh/clean-exclude' * jh/clean-exclude: builtin/clean.c: Use STRING_LIST_INIT_NODUP. | 06 September 2010, 23:57:05 UTC |
| bdab6a5 | Thiago Farina | 06 September 2010, 23:32:55 UTC | builtin/clean.c: Use STRING_LIST_INIT_NODUP. Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 September 2010, 23:56:51 UTC |
| 347c47e | Junio C Hamano | 06 September 2010, 23:46:36 UTC | Merge branch 'jl/maint-fix-test' * jl/maint-fix-test: Several tests: cd inside subshell instead of around Conflicts: t/t9600-cvsimport.sh | 06 September 2010, 23:46:36 UTC |
| fd4ec4f | Jens Lehmann | 06 September 2010, 18:39:54 UTC | Several tests: cd inside subshell instead of around Fixed all places where it was a straightforward change from cd'ing into a directory and back via "cd .." to a cd inside a subshell. Found these places with "git grep -w "cd \.\.". Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 September 2010, 21:30:53 UTC |
| c2e0940 | Jens Lehmann | 06 September 2010, 18:41:06 UTC | t3404 & t7508: cd inside subshell instead of around Fixed all places where it was a straightforward change from cd'ing into a directory and back via "cd .." to a cd inside a subshell. Found these places with "git grep -w "cd \.\.". Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 September 2010, 21:27:35 UTC |
| 4682693 | Junio C Hamano | 06 September 2010, 07:12:04 UTC | Merge branch 'maint' * maint: tag.c: whitespace breakages fix Fix whitespace issue in object.c t5505: add missing && | 06 September 2010, 07:12:04 UTC |
| af24059 | Junio C Hamano | 06 September 2010, 07:11:59 UTC | Merge branch 'xx/trivial' into maint * xx/trivial: tag.c: whitespace breakages fix Fix whitespace issue in object.c t5505: add missing && | 06 September 2010, 07:11:59 UTC |
| d2c030d | Junio C Hamano | 06 September 2010, 05:32:05 UTC | tag.c: whitespace breakages fix Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 September 2010, 05:32:05 UTC |
| 55b4e9e | Jared Hance | 05 September 2010, 19:36:33 UTC | Fix whitespace issue in object.c 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> | 06 September 2010, 05:12:29 UTC |
| 65b26eb | Jens Lehmann | 05 September 2010, 12:56:11 UTC | t5505: add missing && Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 September 2010, 05:10:22 UTC |
| 02377cf | Junio C Hamano | 04 September 2010, 15:17:09 UTC | Merge branch 'jl/submodule-ignore-diff' * 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 | 04 September 2010, 15:17:09 UTC |
| a2c6726 | Junio C Hamano | 04 September 2010, 15:15:36 UTC | Merge branch 'ab/test-2' * 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 | 04 September 2010, 15:15:36 UTC |
| b480d38 | Junio C Hamano | 04 September 2010, 05:45:58 UTC | Merge branch 'js/detached-stash' * 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 | 04 September 2010, 05:45:58 UTC |
| 306d7e5 | Junio C Hamano | 04 September 2010, 05:24:29 UTC | Merge branch 'js/maint-reflog-beyond-horizon' * 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. | 04 September 2010, 05:24:29 UTC |
| c208e05 | Junio C Hamano | 04 September 2010, 05:23:49 UTC | Merge branch 'dg/local-mod-error-messages' * 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 | 04 September 2010, 05:23:49 UTC |
| f92d62e | Junio C Hamano | 04 September 2010, 05:23:13 UTC | Merge branch 'nd/maint-fix-replace' * nd/maint-fix-replace: parse_object: pass on the original sha1, not the replaced one | 04 September 2010, 05:23:13 UTC |
| 2e3400c | Nguyễn Thái Ngọc Duy | 03 September 2010, 20:51:53 UTC | parse_object: pass on the original sha1, not the replaced one 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> | 04 September 2010, 05:13:08 UTC |
| d5af510 | Schalk, Ken | 01 September 2010, 20:15:32 UTC | RE: [PATCH] Avoid rename/add conflict when contents are identical >Due to this this (and maybe all the tests) need to depend on the >SYMLINKS prereq. Here's a third attempt with no use of symlinks in the test: Skip the entire rename/add conflict case if the file added on the other branch has the same contents as the file being renamed. This avoids giving the user an extra copy of the same file and presenting a conflict that is confusing and pointless. A simple test of this case has been added in t/t3030-merge-recursive.sh. Signed-off-by: Ken Schalk <ken.schalk@intel.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 September 2010, 18:26:49 UTC |
| cd1547d | Junio C Hamano | 03 September 2010, 16:43:45 UTC | Merge branch 'ab/compat-regex' * 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 | 03 September 2010, 16:43:45 UTC |
| c6babe5 | Junio C Hamano | 03 September 2010, 16:43:45 UTC | Merge branch 'nd/clone-depth-zero' * nd/clone-depth-zero: clone: warn users --depth is ignored in local clones | 03 September 2010, 16:43:45 UTC |
| f9c8e7c | Junio C Hamano | 03 September 2010, 16:43:44 UTC | Merge branch 'jn/maint-doc-user-manual-html-doctype' * jn/maint-doc-user-manual-html-doctype: docs: fix Makefile dependency for user manual Documentation: set a !DOCTYPE for user manual | 03 September 2010, 16:43:44 UTC |
| 1998f4c | Junio C Hamano | 03 September 2010, 16:43:44 UTC | Merge branch 'cb/maint-mergetool-no-tty' * cb/maint-mergetool-no-tty: mergetool: Remove explicit references to /dev/tty Conflicts: git-mergetool.sh | 03 September 2010, 16:43:44 UTC |
| 9502751 | Junio C Hamano | 03 September 2010, 16:43:44 UTC | Merge branch 'jn/apply-filename-with-sp' * 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 | 03 September 2010, 16:43:44 UTC |
| 460645a | Junio C Hamano | 03 September 2010, 16:43:43 UTC | Merge branch 'jn/merge-custom-no-trivial' * 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 | 03 September 2010, 16:43:43 UTC |
| 7bdaf0b | Junio C Hamano | 03 September 2010, 16:43:42 UTC | Merge branch 'jc/maint-doc-em-dash' * jc/maint-doc-em-dash: Work around em-dash handling in newer AsciiDoc | 03 September 2010, 16:43:42 UTC |
| b9f171c | Junio C Hamano | 03 September 2010, 16:43:42 UTC | Merge branch 'mg/doc-bundle' * 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 | 03 September 2010, 16:43:42 UTC |
| c0808fe | Junio C Hamano | 03 September 2010, 16:43:42 UTC | Merge branch 'jn/doc-backslash' * 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 | 03 September 2010, 16:43:42 UTC |
| 2b916ff | Junio C Hamano | 03 September 2010, 16:43:42 UTC | Merge branch 'jn/update-contrib-example-merge' * 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 ... | 03 September 2010, 16:43:42 UTC |
| 8aed4a5 | Junio C Hamano | 03 September 2010, 16:43:41 UTC | Merge branch 'jn/merge-renormalize' * 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 | 03 September 2010, 16:43:41 UTC |
| 22ffc39 | Junio C Hamano | 03 September 2010, 16:39:38 UTC | Sync with 1.7.2.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 September 2010, 16:39:38 UTC |
| dd34b6b | Junio C Hamano | 03 September 2010, 16:38:53 UTC | Git 1.7.2.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 September 2010, 16:38:53 UTC |
| e78d01b | Thiago Farina | 30 August 2010, 03:30:22 UTC | builtin/merge_recursive.c: Add an usage string and make use of it. 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> | 03 September 2010, 16:37:10 UTC |
| 4bf9dd9 | Jens Lehmann | 01 September 2010, 21:28:27 UTC | t7406 & t7407: add missing && at end of lines Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 September 2010, 16:34:32 UTC |
| 1e28476 | Jens Lehmann | 01 September 2010, 21:01:49 UTC | t7405: cd inside subshell instead of around 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> | 03 September 2010, 16:33:23 UTC |
| c5978a5 | Matthieu Moy | 03 September 2010, 15:25:33 UTC | t7609-merge-co-error-msgs: test non-fast forward case too. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 September 2010, 16:31:59 UTC |
| 5e65ee3 | Matthieu Moy | 02 September 2010, 16:08:15 UTC | Move "show_all_errors = 1" to setup_unpack_trees_porcelain() 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> | 03 September 2010, 16:31:51 UTC |
| e294030 | Matthieu Moy | 02 September 2010, 11:57:34 UTC | setup_unpack_trees_porcelain: take the whole options struct as parameter 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> | 03 September 2010, 16:31:41 UTC |
| dc1166e | Matthieu Moy | 02 September 2010, 11:57:33 UTC | Move set_porcelain_error_msgs to unpack-trees.c and rename it 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> | 03 September 2010, 16:31:28 UTC |
| b49c452 | Junio C Hamano | 01 September 2010, 21:17:32 UTC | Prepare for 1.7.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 September 2010, 22:11:07 UTC |
| 88bf110 | Junio C Hamano | 01 September 2010, 22:10:18 UTC | Merge branch 'maint' * maint: Prepare for 1.7.2.3 | 01 September 2010, 22:10:18 UTC |
| 22da742 | Junio C Hamano | 01 September 2010, 21:15:35 UTC | Prepare for 1.7.2.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 September 2010, 22:10:03 UTC |
| af6c6e0 | Junio C Hamano | 01 September 2010, 21:05:05 UTC | Merge branch 'gp/pack-refs-remove-empty-dirs' into maint * gp/pack-refs-remove-empty-dirs: pack-refs: remove newly empty directories | 01 September 2010, 21:05:05 UTC |
| c7f649a | Junio C Hamano | 01 September 2010, 20:57:23 UTC | Merge branch 'sg/rerere-gc-old-still-used' into maint * sg/rerere-gc-old-still-used: rerere: fix overeager gc mingw_utime(): handle NULL times parameter | 01 September 2010, 20:57:23 UTC |
| e4f8fce | Junio C Hamano | 01 September 2010, 20:56:10 UTC | Merge branch 'np/maint-huge-delta-generation' into maint * np/maint-huge-delta-generation: fix >4GiB source delta assertion failure | 01 September 2010, 20:56:10 UTC |
| 6da28b4 | Junio C Hamano | 01 September 2010, 20:52:10 UTC | Merge branch 'dj/fetch-tagopt' into maint * dj/fetch-tagopt: fetch: allow command line --tags to override config | 01 September 2010, 20:52:10 UTC |
| e917918 | Junio C Hamano | 01 September 2010, 20:50:46 UTC | Merge branch 'da/fix-submodule-sync-superproject-config' into maint * da/fix-submodule-sync-superproject-config: submodule sync: Update "submodule.<name>.url" | 01 September 2010, 20:50:46 UTC |
| 061219f | Junio C Hamano | 01 September 2010, 20:43:55 UTC | Merge branch 'en/rebase-against-rebase-fix' into maint * en/rebase-against-rebase-fix: pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches t5520-pull: Add testcases showing spurious conflicts from git pull --rebase | 01 September 2010, 20:43:55 UTC |
| 7e42332 | Junio C Hamano | 01 September 2010, 16:25:17 UTC | install-webdoc: filter timestamp-only changes correctly The timestamp that follows "Last updated " is formatted differently depending on the version of AsciiDoc. Looking at 4604fe56 on "html" branch, you can see that AsciiDoc 7.0.2 used to give "02-Jul-2008 03:02:14 UTC" but AsciiDoc 8.2.5 gave "2008-09-19 06:33:25 UTC". We haven't been correctly filtering out phantom changes that result from only the build date for some time now, it seems. Just filter lines that begin with "Last updated ". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 September 2010, 16:25:17 UTC |
| fd5c363 | Thiago Farina | 01 September 2010, 02:29:08 UTC | builtin.h: Move two functions definitions to help.h. The two functions defined here are implemented in help.c, so makes more sense to put the definition of those in help.h instead of in builtin.h. Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 September 2010, 15:00:51 UTC |
| e3efa9c | Junio C Hamano | 31 August 2010, 23:34:16 UTC | Merge branch 'np/maint-huge-delta-generation' * np/maint-huge-delta-generation: fix >4GiB source delta assertion failure | 31 August 2010, 23:34:16 UTC |
