| 8c67c39 | Junio C Hamano | 19 August 2010, 23:03:18 UTC | Git 1.7.2.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 August 2010, 23:03:18 UTC |
| 745654f | Junio C Hamano | 19 August 2010, 22:49:54 UTC | Merge branch 'tr/xsize-bits' into maint * tr/xsize-bits: xsize_t: check whether we lose bits | 19 August 2010, 22:49:54 UTC |
| 6baa9bd | Junio C Hamano | 19 August 2010, 22:49:24 UTC | Merge branch 'jc/sha1-name-find-fix' into maint * jc/sha1-name-find-fix: sha1_name.c: fix parsing of ":/token" syntax Conflicts: sha1_name.c | 19 August 2010, 22:49:24 UTC |
| 0a4139b | Junio C Hamano | 18 August 2010, 23:30:11 UTC | Merge branch 'sp/fix-smart-http-deadlock-on-error' into maint * sp/fix-smart-http-deadlock-on-error: smart-http: Don't deadlock on server failure | 18 August 2010, 23:30:11 UTC |
| 452c6d5 | Matthieu Moy | 02 August 2010, 13:42:44 UTC | push: mention "git pull" in error message for non-fast forwards The message remains fuzzy to include "git pull", "git pull --rebase" and others, but directs the user to the simplest solution in the vast majority of cases. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 August 2010, 01:06:07 UTC |
| 9874606 | Jonathan Nieder | 12 August 2010, 22:11:15 UTC | Standardize do { ... } while (0) style Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2010, 22:44:51 UTC |
| 0d1d6e5 | Brandon Casey | 12 August 2010, 20:55:54 UTC | t/t7003: replace \t with literal tab in sed expression The sed utilities on IRIX and Solaris do not interpret the sequence '\t' to mean a tab character; they read a literal character 't'. So, use a literal tab instead. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2010, 22:35:04 UTC |
| 6e2a09d | Nelson Elhage | 12 August 2010, 14:18:12 UTC | index-pack: Don't follow replace refs. Without this, attempting to index a pack containing objects that have been replaced results in a fatal error that looks like: fatal: SHA1 COLLISION FOUND WITH <replaced-object> ! Signed-off-by: Nelson Elhage <nelhage@ksplice.com> Acked-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2010, 20:26:05 UTC |
| b5e233e | Matthieu Moy | 11 August 2010, 08:14:13 UTC | post-receive-email: remove spurious commas in email subject The previous form produced subjects like [SCM] project.git branch, foo, updated. ... The new one will produce the lighter [SCM] project.git branch foo updated. ... Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 August 2010, 18:23:25 UTC |
| 7e7db5e | Raja R Harinath | 13 July 2010, 11:51:48 UTC | fast-import: export correctly marks larger than 2^20-1 dump_marks_helper() has a bug when dumping marks larger than 2^20-1, i.e., when the sparse array has more than two levels. The bug was that the 'base' counter was being shifted by 20 bits at level 3, and then again by 10 bits at level 2, rather than a total shift of 20 bits in this argument to the recursive call: (base + k) << m->shift There are two ways to fix this correctly, the elegant: (base + k) << 10 and the one I chose due to edit distance: base + (k << m->shift) Signed-off-by: Raja R Harinath <harinath@hurrynot.org> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 August 2010, 17:45:15 UTC |
| 5536934 | Ævar Arnfjörð Bjarmason | 10 August 2010, 12:14:25 UTC | t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATH Change the git-svn tests to use $PERL_PATH, not the "perl" in $PATH. Using perl in $PATH was added by Sam Vilain in v1.6.6-rc0~95^2~3, Philippe Bruhat introduced $PERL_PATH to the test suite in v1.6.6-rc0~9^2, but the lib-git-svn.sh tests weren't updated to use the new convention. This resulted in the git-svn tests always being skipped on my system. My /usr/bin/perl has access to SVN::Core and SVN::Repos, but the perl in my $PATH does not. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 August 2010, 17:41:08 UTC |
| d8faea9 | Jakub Narebski | 09 August 2010, 14:50:53 UTC | diff: strip extra "/" when stripping prefix There are two ways a user might want to use "diff --relative": 1. For a file in a directory, like "subdir/file", the user can use "--relative=subdir/" to strip the directory. 2. To strip part of a filename, like "foo-10", they can use "--relative=foo-". We currently handle both of those situations. However, if the user passes "--relative=subdir" (without the trailing slash), we produce inconsistent results. For the unified diff format, we collapse the double-slash of "a//file" correctly into "a/file". But for other formats (raw, stat, name-status), we end up with "/file". We can do what the user means here and strip the extra "/" (and only a slash). We are not hurting any existing users of (2) above with this behavior change because the existing output for this case was nonsensical. Patch by Jakub, tests and commit message by Jeff King. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 August 2010, 16:46:47 UTC |
| 497d9c3 | Jonathan Nieder | 07 August 2010, 21:56:47 UTC | gitweb: clarify search results page when no matching commit found When searching commits for a string that never occurs, the results page looks something like this: projects / foo.git / search \o/ summary | ... | tree [commit] search: [ kfjdkas ] [ ]re first ⋅ prev ⋅ next Merge branch 'maint' Foo: a demonstration project Without a list of hits to compare it to, the header describing the commit named by the hash parameter (usually HEAD) may itself look like a hit. Add some text (“No match.”) to replace the empty list of hits and avoid this confusion. While at it, remove some nearby dead code, left behind from a simplification a few years ago (v1.5.4-rc0~276^2~4, 2007-11-01). Noticed-by: Erick Mattos <erick.mattos@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2010, 20:05:35 UTC |
| 977ed83 | Jonathan Nieder | 09 August 2010, 01:32:43 UTC | Documentation: add a FILES section for show-ref A peek at where the refs are kept might help understanding, even if, as the DESCRIPTION section suggests, direct access is not part of the public API. Balance that out with a pointer to update-ref. Suggested-by: Geoff Russell <geoffrey.russell@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2010, 19:33:50 UTC |
| 48c250a | Jonathan Nieder | 08 August 2010, 21:48:59 UTC | Makefile: add missing dependency on http.h v1.7.1-rc0~65^2~2 (http: init and cleanup separately from http-walker, 2010-03-02) introduced a direct dependency from http-fetch on the HTTP request library. Declare it. Detected with "make CHECK_HEADER_DEPENDENCIES=1". Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2010, 19:13:27 UTC |
| 5fedde3 | Jonathan Nieder | 08 August 2010, 21:25:11 UTC | Makefile: add missing dependencies on url.h v1.7.2-rc0~56^2 and its parent (decode file:// and ssh:// URLs, 2010-05-23) introduced a new url library. Update the Makefile with the relevant dependencies. Detected with "make CHECK_HEADER_DEPENDENCIES=1". Cc: Jeff King <peff@peff.net> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2010, 19:12:22 UTC |
| b1c7946 | Michael J Gruber | 08 August 2010, 15:31:34 UTC | Documentation/git-log: Clarify --full-diff The current description gives the impression that "--full-diff" affects "log -p" only. Make it clearer that it affects all diff-based output types. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2010, 18:53:32 UTC |
| 1bc6bf6 | Willy Tarreau | 08 August 2010, 05:13:32 UTC | git-rebase: fix typo when parsing --force-rebase Due to two missing hyphens, The "force" keyword on the command line would be taken as an alias for the --force-rebase option. Signed-off-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2010, 18:51:50 UTC |
| 1702b13 | Ævar Arnfjörð Bjarmason | 07 August 2010, 23:09:45 UTC | imap-send: Fix sprintf usage When composing a command for the imap server, imap-send uses a single nfsnprintf() invocation for brevity instead of dealing separately with the case when there is a message to be sent and the case when there isn’t. The unused argument in the second case, while valid, is confusing for static analyzers and human readers. v1.6.4-rc0~117 (imap-send: add support for IPv6, 2009-05-25) mistakenly used %hu as the format for an int “port”, by analogy with existing usage for the unsigned short “addr.sin_port”. Use %d instead. Noticed with clang. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2010, 18:35:46 UTC |
| 24aea03 | René Scharfe | 06 August 2010, 20:28:05 UTC | prune: allow --dry-run for -n and --verbose for -v For consistency with other git commands, let git prune accept the long options --dry-run and --verbose for the respective short ones -n and -v. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2010, 17:13:18 UTC |
| e93487d | René Scharfe | 06 August 2010, 20:28:09 UTC | notes: allow --dry-run for -n and --verbose for -v For consistency with other git commands, let the prune subcommand of git notes accept the long options --dry-run and --verbose for the respective short ones -n and -v. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2010, 17:12:50 UTC |
| cf958af | Matthieu Moy | 05 August 2010, 16:14:25 UTC | Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -C These options take an optional argument, but this optional argument was not documented. Original patch by Matthieu Moy, but documentation for -B mostly copied from the explanations of Junio C Hamano. While we're there, fix a typo in a comment in diffcore.h. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2010, 16:16:11 UTC |
| 08b2982 | Brad King | 03 August 2010, 18:41:50 UTC | Documentation: cite git-am from git-apply Users reading git-apply documentation may also be interested in git-am, especially after receiving an email created with git-format-patch. The documentation for git-am already references git-apply. Add the reverse. Signed-off-by: Brad King <brad.king@kitware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2010, 16:15:41 UTC |
| 3c8710a | Thomas Rast | 29 July 2010, 15:10:22 UTC | t7003: fix subdirectory-filter test The test would not fail if the filtering failed to do anything, since in test -z "$(git diff HEAD directorymoved:newsubdir)"' 'directorymoved:newsubdir' is not valid, so git-diff fails without printing anything on stdout. But then the exit status of git-diff is lost, whereas test -z "" succeeds. Use 'git diff --exit-code' instead, which does the right thing and has the added bonus of showing the differences if there are any. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2010, 16:15:01 UTC |
| b4ee10f | Shawn O. Pearce | 06 August 2010, 21:19:44 UTC | smart-http: Don't deadlock on server failure If the remote HTTP server fails (e.g. returns 404 or 500) when we posted the RPC to it, we won't have sent anything to the background Git process that is supposed to handle the stream. Because we didn't send anything, its waiting for input from remote-curl, and remote-curl cannot read its response payload because doing so would lead to a deadlock. Send the background task EOF on its input before we try to read its response back, that way it will break out of its read loop and terminate. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 August 2010, 22:30:16 UTC |
| 49cc460 | Jonathan Nieder | 06 August 2010, 03:39:22 UTC | Allow "check-ref-format --branch" from subdirectory check-ref-format --branch requires access to the repository to resolve refs like @{-1}. Noticed by Nguyễn Thái Ngọc Duy. 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> | 06 August 2010, 17:01:45 UTC |
| cfbe22f | Jonathan Nieder | 06 August 2010, 03:36:07 UTC | check-ref-format: handle subcommands in separate functions The code for each subcommand should be easier to read and manipulate this way. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 August 2010, 17:00:39 UTC |
| 2429e8d | Matthieu Moy | 05 August 2010, 13:08:05 UTC | pretty-options.txt: match --format's documentation with implementation. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 August 2010, 16:49:49 UTC |
| bb89e84 | Junio C Hamano | 03 August 2010, 22:17:34 UTC | Merge branch 'sv/maint-diff-q-clear-fix' into maint * sv/maint-diff-q-clear-fix: Fix DIFF_QUEUE_CLEAR refactoring | 03 August 2010, 22:17:34 UTC |
| 7b6e6b3 | Junio C Hamano | 03 August 2010, 22:17:11 UTC | Merge branch 'rr/svn-fe' into maint * rr/svn-fe: contrib/svn-fe: Add the svn-fe target to .gitignore contrib/svn-fe: Fix IncludePath | 03 August 2010, 22:17:11 UTC |
| e9aa241 | Junio C Hamano | 03 August 2010, 22:16:38 UTC | Merge branch 'pt/git-gui' into maint * pt/git-gui: git-gui: fix size and position of window panes on startup git-gui: mc cannot be used before msgcat has been loaded git-gui: use textconv filter for diff and blame git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32 git-gui: fix shortcut creation on cygwin git-gui: fix PATH environment for mingw development environment git-gui: fix usage of _gitworktree when creating shortcut for windows git-gui: fix "Explore Working Copy" for Windows again git-gui: fix usage of themed widgets variable git-gui: Handle failure of core.worktree to identify the working directory. git-gui: check whether systems nice command works or disable it | 03 August 2010, 22:16:38 UTC |
| 755a605 | Ramkumar Ramachandra | 29 July 2010, 05:36:20 UTC | contrib/svn-fe: Add the svn-fe target to .gitignore Add the svn-fe target to .gitignroe. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 August 2010, 13:49:22 UTC |
| 199f549 | Ramkumar Ramachandra | 29 July 2010, 05:36:19 UTC | contrib/svn-fe: Fix IncludePath Include the path "../../vcs-svn" while compiling it in the Makefile and change svn-fe.c to include svndump.h. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 August 2010, 13:49:20 UTC |
| f7bff00 | Junio C Hamano | 02 August 2010, 21:37:06 UTC | sha1_name.c: fix parsing of ":/token" syntax The parser tried to clean up the object flags it used while finding commits with matching string, but was not doing a very good job at it. This caused "checkout -b new ':/token'", which internally tries to parse ':/token' twice as an object name, to fail when the commit in question was reachable from only one ref. The mask bits given to pop_most_recent_commit(&list, MASK) means "I have already been on the list to be processed, so please do not place me again even if I am found to be a parent of some other commit on the list." So mark them when we add them to the list at the beginning. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2010, 21:40:48 UTC |
| 7d80812 | Junio C Hamano | 02 August 2010, 18:53:58 UTC | Merge branch 'ab/tap' into maint * ab/tap: test-lib: Remove 3 year old no-op --no-python option test-lib: Ignore --quiet under a TAP harness | 02 August 2010, 18:53:58 UTC |
| d596f33 | Ævar Arnfjörð Bjarmason | 31 July 2010, 16:49:53 UTC | test-lib: Remove 3 year old no-op --no-python option The --no-python option was added to test-lib.sh by Johannes Schindelin in early 2006 in abb7c7b3. It was later turned into a no-op by Junio C Hamano in 7cdbff14 the same year. Over three years is long enough before removing this old wart which was retained for backwards compatibility. Our tests have been using NO_PYTHON and "test_have_prereq PYTHON" for a long time now. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2010, 18:53:52 UTC |
| 092c433 | Ævar Arnfjörð Bjarmason | 31 July 2010, 16:40:05 UTC | test-lib: Ignore --quiet under a TAP harness Running the tests with --quiet under a TAP harness will always fail, since a TAP harness always needs actual test output to go along with the plan that's being emitted. Change the test-lib.sh to ignore the --quiet option under HARNESS_ACTIVE to work around this. Then users that have --quiet in their GIT_TEST_OPTS can run tests under prove(1) without everything breaking. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2010, 18:53:48 UTC |
| c01a29c | Junio C Hamano | 02 August 2010, 16:28:30 UTC | Merge git://repo.or.cz/git-gui into pt/git-gui * git://repo.or.cz/git-gui: git-gui: fix size and position of window panes on startup git-gui: mc cannot be used before msgcat has been loaded git-gui: use textconv filter for diff and blame git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32 git-gui: fix shortcut creation on cygwin git-gui: fix PATH environment for mingw development environment git-gui: fix usage of _gitworktree when creating shortcut for windows git-gui: fix "Explore Working Copy" for Windows again git-gui: fix usage of themed widgets variable git-gui: Handle failure of core.worktree to identify the working directory. git-gui: check whether systems nice command works or disable it | 02 August 2010, 16:28:30 UTC |
| ac2e1e6 | Thomas Rast | 30 July 2010, 15:01:50 UTC | Documentation/rev-parse: quoting is required with --parseopt When calling rev-parse --parseopt, as in the (now fixed) documented example eval "$(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)" the outermost quoting is required, as otherwise all runs of arbitrary whitespace inside the resulting 'set -- ...' call would be collapsed into a single space. This was exposed as a result of our new use of cat <<\EOF since 47e9cd2 (parseopt: wrap rev-parse --parseopt usage for eval consumption, 2010-06-12), but has always been a problem when handling arguments containing e.g. newlines. Point this out in the documentation, and in particular correct the example that did not have the quotes. Noticed-by: Joshua Jensen <jjensen@workspacewhiz.com> Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2010, 16:11:28 UTC |
| c97ca27 | Junio C Hamano | 02 August 2010, 16:07:39 UTC | Documentation: reporting bugs Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2010, 16:07:39 UTC |
| ee38d82 | Junio C Hamano | 02 August 2010, 15:29:42 UTC | Fix DIFF_QUEUE_CLEAR refactoring It introduced a macro to reduce repeated assignments to three fields, but an unrelated and incorrect change snuck in by mistake, which broke commands like "git diff-files -p --submodule". Noticed by Sven Verdoolaege. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2010, 15:30:02 UTC |
| 2810a58 | Pat Thoyts | 02 August 2010, 12:42:45 UTC | git-gui: fix size and position of window panes on startup The themed panedwindow needs to have the sash position set after the widget has been mapped therefore apply this setting in the Map event binding. To avoid visible redraws as the application is constructed the main window should be withdrawn until all the widgets have been added Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 02 August 2010, 12:42:45 UTC |
| 9cb268c | Pat Thoyts | 02 August 2010, 11:13:05 UTC | git-gui: mc cannot be used before msgcat has been loaded If someone attempts to use an older version that Tk 8.4 the error was masked by the lack of a mc command. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 02 August 2010, 11:13:05 UTC |
| 1fbacca | Clément Poulain | 30 July 2010, 08:11:02 UTC | git-gui: use textconv filter for diff and blame Create a checkbox "Use Textconv For Diffs and Blame" in git-gui options. If checked and if the driver for the concerned file exists, git-gui calls diff and blame with --textconv option Signed-off-by: Clément Poulain <clement.poulain@ensimag.imag.fr> Signed-off-by: Diane Gasselin <diane.gasselin@ensimag.imag.fr> Signed-off-by: Axel Bonnet <axel.bonnet@ensimag.imag.fr> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 July 2010, 09:05:27 UTC |
| 8512354 | Pat Thoyts | 08 March 2010, 12:43:27 UTC | git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32 On Windows the Control-C binding is used to copy and is mapped to the Tk virtual event <<Copy>>. In the initial git-gui dialog this is also bound as an accelerator for the Clone menu item. The effect is that both bindings run, copying the text but resetting the clone page or switching to the clone page when the user tries to copy text from one of the entry fields. This patch avoids this by using Control-L instead for Windows only. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 July 2010, 09:05:27 UTC |
| fc17e5e | Heiko Voigt | 27 February 2010, 20:48:48 UTC | git-gui: fix shortcut creation on cygwin When the user tried to create a desktop icon with git gui on cygwin wscript was complaining about an unknown option and displaying the non-native path as such. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 July 2010, 09:05:26 UTC |
| 4c79adc | Heiko Voigt | 27 February 2010, 20:47:42 UTC | git-gui: fix PATH environment for mingw development environment When creating a desktop shortcut from the gui the shortcut directly starts wish with the git-gui script. In the msysgit development environment some dll's reside in the mingw/bin directory which causes that git can not start because libiconv2.dll is not found. When using such a link the error is even more cryptic stating: "child killed: unknown signal" Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 July 2010, 08:57:26 UTC |
| a197b1e | Heiko Voigt | 27 February 2010, 20:45:51 UTC | git-gui: fix usage of _gitworktree when creating shortcut for windows This fixes msysGit issue 425. Signed-off-by: Heiko Voigt <heiko.voigt@mahr.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 July 2010, 08:57:26 UTC |
| 2e0cda6 | Markus Heidelberg | 25 February 2010, 00:14:22 UTC | git-gui: fix "Explore Working Copy" for Windows again It has already been fixed in commit 454efb47 (git-gui (Win): make "Explore Working Copy" more robust, 2009-04-01), but has been broken in commit 21985a11 (git-gui: handle non-standard worktree locations, 2010-01-23) by accidentally replacing too much with a new variable. The problem can be reproduced when starting git-gui from within a subdirectory. The solution is to convert the path name, explorer.exe is invoked with, to a platform native name. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 30 July 2010, 08:57:26 UTC |
| 46be82d | Thomas Rast | 28 July 2010, 16:36:31 UTC | xsize_t: check whether we lose bits Attempting to mmap (via git-add or similar) a file larger than 4GB on 32-bit Linux systems results in a repository that has only the file modulo 4GB stored, because of truncation of the off_t file size to a size_t for mmap. When xsize_t was introduced to handle this truncation in dc49cd7 (Cast 64 bit off_t to 32 bit size_t, 2007-03-06), Shawn even pointed out that it should detect when such a cutoff happens. Make it so. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2010, 21:08:44 UTC |
| 25e9325 | David D. Kilzer | 28 July 2010, 08:20:16 UTC | Fix git rebase --continue to work with touched files When performing a non-interactive rebase, sometimes "git rebase --continue" will fail if an unmodified file is touched in the working directory: You must edit all merge conflicts and then mark them as resolved using git add This is caused by "git diff-files" reporting a difference between the index and the filesystem: :100644 100644 d00491...... 000000...... M file The fix is to run "git update-index --refresh" before "git diff-files" as is done in git-rebase--interactive. Signed-off-by: David D. Kilzer <ddkilzer@kilzer.net> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2010, 20:57:36 UTC |
| 5bc0e24 | Matthieu Moy | 28 July 2010, 07:24:27 UTC | Document ls-files -t as semi-obsolete. The behavior of "git ls-files -t" is very misleading (see http://thread.gmane.org/gmane.comp.version-control.git/126516 and http://thread.gmane.org/gmane.comp.version-control.git/144394/focus=144397 for examples of mislead users) and badly documented, hence we point the users to superior alternatives. The feature is marked as "semi-obsolete" but not "scheduled for removal" since it's a plumbing command, scripts might use it, and Git testsuite already uses it to test the state of the index. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2010, 20:56:45 UTC |
| 2aedccd | Junio C Hamano | 27 July 2010, 23:42:47 UTC | Git 1.7.2.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 July 2010, 23:42:53 UTC |
| 33a0292 | Junio C Hamano | 27 July 2010, 23:40:15 UTC | Sync with 1.7.1.2 | 27 July 2010, 23:40:23 UTC |
| 245b10c | Junio C Hamano | 27 July 2010, 22:04:49 UTC | Git 1.7.1.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 July 2010, 23:36:51 UTC |
| e5498e8 | Junio C Hamano | 27 July 2010, 22:01:36 UTC | Sync with 1.7.0 series | 27 July 2010, 22:01:36 UTC |
| 593ce2b | Junio C Hamano | 27 July 2010, 21:07:41 UTC | Git 1.7.0.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 July 2010, 21:09:11 UTC |
| 79bf149 | Jonathan Nieder | 26 July 2010, 15:06:51 UTC | config --get --path: check for unset $HOME If $HOME is unset (as in some automated build situations), currently git config --path path.home "~" git config --path --get path.home segfaults. Error out with Failed to expand user dir in: '~/' instead. Reported-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 July 2010, 17:58:46 UTC |
| 49bb1f2 | Stephen Boyd | 27 July 2010, 05:40:32 UTC | commit: remove full stop from usage help for -u From api-parse-options.txt: `description` is a short string to describe the effect of the option. It shall begin with a lower-case letter and a full stop (`.`) shall be omitted at the end. It also makes it less confusing if the argument is 'no.' or 'no'. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 July 2010, 16:44:17 UTC |
| d3b9dd1 | Matthieu Moy | 26 July 2010, 16:32:09 UTC | Clarify help message when no remote is specified in fetch/pull. The message is especially confusing when "git fetch" is ran from "git pull", for users not aware of "git fetch". The new message makes it clear that "fetch" means "fetch new revisions", and gives hint on the solution. We don't add a advice.* configuration option since this message doesn't appear in normal use, and shouldn't disturb advanced users. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 July 2010, 16:12:23 UTC |
| e8b4ac3 | Thomas Rast | 26 July 2010, 08:40:58 UTC | Makefile: add check-docs exception for gitrevisions The manpage was added in 1ed6f2c (Documentation: gitrevisions, 2010-07-05), but since it does not have a corresponding git command, it needs an exception for check-docs. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 July 2010, 16:05:01 UTC |
| 293b07f | Thomas Rast | 26 July 2010, 08:36:24 UTC | Fix 'git' wrapper usage string 8b1fa77 (Allow passing of configuration parameters in the command line, 2010-03-26) forgot the closing ']' for the -c option. While we're there, also rewrap. Instead of folding the last two lines together, try to highlight that COMMAND is required by starting a line with it. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 July 2010, 16:04:21 UTC |
| 9a9fb5d | Thomas Rast | 24 July 2010, 16:03:15 UTC | Documentation/git-push: Explain status output in more detail Mention the effects of the receive.deny* family of options for the "remote rejected" case. While there, also split up the explanation into an easier-to-parse list format. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 July 2010, 06:14:19 UTC |
| 662c83f | Thomas Rast | 24 July 2010, 16:07:53 UTC | Document receive.denyDeleteCurrent This option was introduced by 747ca24 (receive-pack: receive.denyDeleteCurrent, 2009-02-08) but never documented. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 July 2010, 06:14:19 UTC |
| 5d31475 | Thomas Rast | 24 July 2010, 15:20:23 UTC | Cast execl*() NULL sentinels to (char *) The NULL sentinel argument to the execl*() family of calls must be cast to (char *), as otherwise: - platforms where NULL is just 0 (not (void *)) would pass an int - (admittedly esoteric) platforms where NULL is (void *)0 and (void *) and (char *) have different memory layouts would pass the wrong kind of pointer Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 July 2010, 06:14:18 UTC |
| cdad3c5 | Nguyễn Thái Ngọc Duy | 25 July 2010, 09:30:32 UTC | git-read-tree.txt: acknowledge the directory matching bug in sparse checkout Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 July 2010, 06:14:18 UTC |
| 0edf06d | Jon Seymour | 25 July 2010, 03:57:35 UTC | INSTALL: configure /etc/xml/catalog to build docs on Cygwin Without additional configuration steps, the documentation build on Cygwin fails because the XML catalog is missing required rewrites for certain docbook resources. This patch documents the required configuration. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 July 2010, 06:14:18 UTC |
| c1e02b2 | Johannes Sixt | 22 July 2010, 08:13:33 UTC | t3700-add: fix dependence on stdout and stderr buffering One test case checked the stdout and stderr of 'git add' by constructing a single 'expect' file that contained both streams. But when the command runs, the order of stdout and stderr output is unpredictable because it depends on how the streams are buffered. At least on Windows, the buffering is different from what the test case expected. Hence, check the two output texts separately. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Acked-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 July 2010, 06:14:18 UTC |
| 938791c | Brandon Casey | 22 July 2010, 19:15:11 UTC | git-rebase--interactive.sh: use printf instead of echo to print commit message On systems with an echo which defaults to the XSI-conformant behavior (Solaris, or others using Ksh), echo will interpret certain backslashed characters as control sequences. This can cause a problem for interactive rebase when it is used to rebase commits whose commit "subject" (the first line) contains any of these backslashed sequences. In this case, echo will substitute the control sequence for the backslashed characters and either the rebased commit message will differ from the original, or the rebase process will fail. Neither is desirable. So work around this issue by replacing the echo statements used to print out portions of the commit message, with printf. Also, add a test to test for this breakage. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 July 2010, 06:14:18 UTC |
| ec13666 | Nathan W. Panike | 22 July 2010, 16:58:20 UTC | Add a google-chrome option for web--browse On some systems, the chrome browser is named google-chrome. We add support for this case. Signed-off-by: Nathan W. Panike <nathan.panike@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 July 2010, 06:14:18 UTC |
| ffd45f9 | Junio C Hamano | 26 July 2010, 06:13:41 UTC | Merge branch 'maint-1.7.1' into maint * maint-1.7.1: request-pull.txt: Document -p option Check size of path buffer before writing into it | 26 July 2010, 06:13:41 UTC |
| c4818fa | Junio C Hamano | 26 July 2010, 04:53:27 UTC | Merge branch 'maint-1.7.0' into maint-1.7.1 * maint-1.7.0: request-pull.txt: Document -p option Check size of path buffer before writing into it | 26 July 2010, 04:53:27 UTC |
| 28bf4ba | Junio C Hamano | 26 July 2010, 04:52:48 UTC | Merge branch 'maint-1.6.6' into maint-1.7.0 * maint-1.6.6: request-pull.txt: Document -p option Check size of path buffer before writing into it rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option | 26 July 2010, 04:52:48 UTC |
| ad33605 | Junio C Hamano | 26 July 2010, 04:52:29 UTC | Merge branch 'maint-1.6.5' into maint-1.6.6 * maint-1.6.5: request-pull.txt: Document -p option Check size of path buffer before writing into it rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option | 26 July 2010, 04:52:29 UTC |
| d8e3ac7 | Stephen Boyd | 23 July 2010, 16:31:27 UTC | request-pull.txt: Document -p option Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 July 2010, 04:52:19 UTC |
| a07b10c | Junio C Hamano | 26 July 2010, 04:51:58 UTC | Merge branch 'maint-1.6.4' into maint-1.6.5 * maint-1.6.4: Check size of path buffer before writing into it rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option | 26 July 2010, 04:51:58 UTC |
| 1b0b962 | Greg Brockman | 20 July 2010, 04:46:21 UTC | Check size of path buffer before writing into it This prevents a buffer overrun that could otherwise be triggered by creating a file called '.git' with contents gitdir: (something really long) Signed-off-by: Greg Brockman <gdb@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 July 2010, 17:33:47 UTC |
| 4bdf859 | Dan McGee | 30 June 2010, 12:29:08 UTC | git-instaweb: Don't assume Apache executable is named apache2 On Arch Linux, the executable for the Apache HTTP server keeps the 'httpd' name and is not named 'apache2'. The path to the server modules also contains 'httpd' rather than 'apache2'. Remove some of these assumptions and add the httpd name in where it may be required. Finally, make some slight style adjustments to the code we are touching to make it fit the style of the rest of the script. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 23 July 2010, 18:16:05 UTC |
| 2989f51 | Dan McGee | 30 June 2010, 02:44:59 UTC | git-instaweb: Fix Apache environment variable passing We were passing the non-existent GIT_EXEC_DIR through instead of the real GIT_EXEC_PATH. In addition, these weren't being passed at all for CGI (non mod_perl) execution so get them included there as well. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 23 July 2010, 18:13:47 UTC |
| 1849f01 | Dan McGee | 30 June 2010, 02:44:58 UTC | git-instaweb: Fix custom apache log placement 'CustomLog' is provided by mod_log_config so we need to include the module in our generated config. This was added in d94775e1f9a. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 23 July 2010, 18:10:21 UTC |
| 64fdc08 | Junio C Hamano | 21 July 2010, 19:55:50 UTC | Git 1.7.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2010, 19:55:50 UTC |
| 6e6842e | Junio C Hamano | 21 July 2010, 19:47:48 UTC | tests: correct "does reflog exist?" tests These two tests weren't about how "git reflog show <branch>" exits when there is no reflog, but were about "checkout" and "branch" create or not create reflog when creating a new <branch>. Update the tests to check what we are interested in, using "git rev-parse --verify". Also lose tests based on "test -f .git/logs/refs/heads/<branch>" from nearby, to avoid exposing this particular implementation detail unnecessarily. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2010, 19:54:48 UTC |
| b1edaf6 | Brandon Casey | 20 July 2010, 21:55:31 UTC | t/: work around one-shot variable assignment with test_must_fail See e2007832552ccea9befed9003580c494f09e666e Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2010, 18:54:34 UTC |
| bdcaa32 | Jonathan Nieder | 21 July 2010, 00:01:01 UTC | t/README: correct an exception when breaking a && chain in tests The correct advice should have been taken from c289c31 (t/t7006: ignore return status of shell's unset builtin, 2010-06-02). A real-life issue we experienced was with "unset", not with "export" (exporting an unset variable may have similar portability issues, though). Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2010, 18:52:26 UTC |
| 77b5be2 | Brandon Casey | 20 July 2010, 18:27:55 UTC | t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_fail The '!()' notation is interpreted as a pattern-list on Ksh. The Ksh man page describe it as follows: !(pattern-list) Matches anything except one of the given patterns. Ksh performs a file glob using the pattern-list and then tries to execute the first file in the list. If a space is added between the '!' and the open parens, then Ksh will not interpret it as a pattern list, but in this case, it is preferred to use test_must_fail, so lets do so. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 July 2010, 18:37:45 UTC |
| 460d562 | Brandon Casey | 20 July 2010, 15:24:47 UTC | t/t3700: convert two uses of negation operator '!' to use test_must_fail These two lines use the negation '!' operator to negate the result of a simple command. Since these commands do not contain any pipes or other complexities, the test_must_fail function can be used and is preferred since it will additionally detect termination due to a signal. This was noticed because the second use of '!' does not include a space between the '!' and the opening parens. Ksh interprets this as follows: !(pattern-list) Matches anything except one of the given patterns. Ksh performs a file glob using the pattern-list and then tries to execute the first file in the list. If a space is added between the '!' and the open parens, then Ksh will not interpret it as a pattern list, but in this case, it is preferred to use test_must_fail, so lets do so. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 July 2010, 18:37:26 UTC |
| 5f7baac | Junio C Hamano | 20 July 2010, 18:29:30 UTC | Merge branch 'maint' * maint: t/README: clarify test_must_fail description Check size of path buffer before writing into it Conflicts: t/README | 20 July 2010, 18:29:30 UTC |
| 971ecbd | Brandon Casey | 20 July 2010, 17:17:12 UTC | t/README: clarify test_must_fail description Some have found the wording of the description to be somewhat ambiguous with respect to when it is desirable to use test_must_fail instead of "! <git-command>". Tweak the wording somewhat to hopefully clarify that it is _because_ test_must_fail can detect segmentation fault that it is desirable to use it instead of "! <git-command>". Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 July 2010, 18:26:39 UTC |
| 3c9d041 | Greg Brockman | 20 July 2010, 04:46:21 UTC | Check size of path buffer before writing into it This prevents a buffer overrun that could otherwise be triggered by creating a file called '.git' with contents gitdir: (something really long) Signed-off-by: Greg Brockman <gdb@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 July 2010, 16:17:39 UTC |
| c5212b8 | Junio C Hamano | 19 July 2010, 18:21:08 UTC | Merge branch 'maint' * maint: update-server-info: Shorten read_pack_info_file() Documentation: Explain git-mergetool's use of temporary files | 19 July 2010, 18:21:08 UTC |
| c173dad | Ralf Thielow | 19 July 2010, 16:26:12 UTC | update-server-info: Shorten read_pack_info_file() The correct responses to a D and a T line in .git/objects/info/packs are the same, so combine their case arms. In both cases we already ‘goto’ out of the switch so while at it, remove a redundant ‘break’ to avoid yet another line of code. Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com> Reviewed-by: Jonathan Nieder <jrnieder <at> gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 July 2010, 18:13:52 UTC |
| f0e5a4b | Ævar Arnfjörð Bjarmason | 17 July 2010, 15:33:15 UTC | git add: Add --ignore-missing to SYNOPSIS All the git add options were listed in the synopsis until the --ignore-missing option was added. Change that so that the git add documentation now has the complete listing. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 July 2010, 18:11:46 UTC |
| 1f74574 | Ævar Arnfjörð Bjarmason | 17 July 2010, 15:53:45 UTC | git submodule add: Remove old docs about implicit -f git submodule add no longer implicitly adds with --force. Remove references to the old functionality in the documentation. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Acked-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 July 2010, 18:11:07 UTC |
| d27b876 | Jens Lehmann | 17 July 2010, 15:11:43 UTC | git submodule add: Require the new --force option to add ignored paths To make the behavior of "git submodule add" more consistent with "git add" ignored submodule paths should not be silently added when they match an entry in a .gitignore file. To be able to override that default behavior in the same way as we can do that for "git add", the new option "--force" is introduced. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 July 2010, 18:10:43 UTC |
| 8fbe9b3 | Junio C Hamano | 19 July 2010, 18:09:38 UTC | Merge branch 'jl/add-n-ignore-missing' * jl/add-n-ignore-missing: git add: Add the "--ignore-missing" option for the dry run | 19 July 2010, 18:09:38 UTC |
| d1cc462 | David Aguilar | 18 July 2010, 01:46:48 UTC | Documentation: Explain git-mergetool's use of temporary files 'git mergetool' creates '*.orig' backup files in its default configuration. Mention this in its documentation. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 July 2010, 16:16:09 UTC |
| 8ac3a66 | Sergey Vlasov | 18 July 2010, 12:17:49 UTC | git-svn: write memoized data explicitly to avoid Storable bug Apparently using the Storable module during global destruction is unsafe - there is a bug which can cause segmentation faults: http://rt.cpan.org/Public/Bug/Display.html?id=36087 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=482355 The persistent memoization support introduced in commit 8bff7c538 relied on global destruction to write cached data, which was leading to segfaults in some Perl configurations. Calling Memoize::unmemoize in the END block forces the cache writeout to be performed earlier, thus avoiding the bug. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Acked-by: Eric Wong <normalperson@yhbt.net> | 19 July 2010, 06:31:04 UTC |
| 24e7a5b | Junio C Hamano | 16 July 2010, 22:45:35 UTC | Merge branch 'jc/diff-merge-base-multi' * jc/diff-merge-base-multi: diff A...B: do not limit the syntax too narrowly | 16 July 2010, 22:45:35 UTC |
| 7ea3ddf | Thomas Rast | 16 July 2010, 09:37:44 UTC | Only run aggregate-results over actual counts The current make target 'aggregate-results' scanned all files matching test-results/t*-*. Normally these are only the test counts (and the exit values, which are ignored), but with --tee the suite also dumps all output. Furthermore, with --verbose t1450 contains several lines starting with "broken link from ..." which matches the criteria used by aggregate-results.sh. Rename the counts output files to *.counts, and only scan those. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 July 2010, 20:25:01 UTC |
| e605164 | Jonathan Nieder | 15 July 2010, 16:25:39 UTC | Add a sample user for the svndump library The svn-fe tool takes a Subversion dump file as input and produces a fast-import stream as output. This can be useful as a low-level tool in building other importers, or for debugging the vcs-svn library. make svn-fe make svn-fe.1 to test. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 July 2010, 20:21:47 UTC |
