| f23ffbe | Junio C Hamano | 17 December 2008, 06:08:22 UTC | GIT 1.5.5.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 06:08:28 UTC |
| 34b146c | Junio C Hamano | 17 December 2008, 06:03:29 UTC | GIT 1.5.4.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 06:06:47 UTC |
| dfff4b7 | Junio C Hamano | 17 December 2008, 03:42:02 UTC | gitweb: do not run "git diff" that is Porcelain Jakub says that legacy-style URI to view two blob differences are never generated since 1.4.3. This codepath runs "git diff" Porcelain from the gitweb, which is a no-no. It can trigger diff.external command that is specified in the configuration file of the repository being viewed. This patch applies to v1.5.4 and later. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 05:54:44 UTC |
| 006f31d | Junio C Hamano | 27 June 2008, 00:16:50 UTC | GIT 1.5.5.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2008, 00:59:51 UTC |
| 53b22a9 | Junio C Hamano | 27 June 2008, 00:14:03 UTC | Merge branch 'maint-1.5.4' into maint-1.5.5 * maint-1.5.4: GIT 1.5.4.6 git-shell: accept "git foo" form Conflicts: GIT-VERSION-GEN RelNotes | 27 June 2008, 00:14:03 UTC |
| 872354d | Junio C Hamano | 27 June 2008, 00:11:21 UTC | GIT 1.5.4.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2008, 00:11:21 UTC |
| bc7c73e | Junio C Hamano | 02 December 2007, 06:16:19 UTC | git-shell: accept "git foo" form This is a backport of 0a47dc110e042b5bcc63dc94c8d517e67efe9306 to 'maint' to be included in 1.5.6.2 so that older server side can accept dashless form of request when clients are updated. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 June 2008, 23:51:23 UTC |
| 4afbcab | Junio C Hamano | 17 June 2008, 00:37:21 UTC | diff.c: fix emit_line() again not to add extra line Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 June 2008, 00:37:21 UTC |
| 06ff64a | SZEDER Gábor | 16 June 2008, 22:00:02 UTC | diff: reset color before printing newline It worked that way since commit 50f575fc (Tweak diff colors, 2006-06-22), but commit c1795bb0 (Unify whitespace checking, 2007-12-13) changed it. This patch restores the old behaviour. Besides Linus' arguments in the log message of 50f575fc, resetting color before printing newline is also important to keep 'git add --patch' happy. If the last line(s) of a file are removed, then that hunk will end with a colored line. However, if the newline comes before the color reset, then the diff output will have an additional line at the end containing only the reset sequence. This causes trouble in git-add--interactive.perl's parse_diff function, because @colored will have one more element than @diff, and that last element will contain the color reset. The elements of these arrays will then be copied to @hunk, but only as many as the number of elements in @diff. As a result the last color reset is lost and all subsequent terminal output will be printed in color. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 June 2008, 22:22:09 UTC |
| 2feaf4e | Fred Maranhão | 11 June 2008, 23:09:48 UTC | fix typo in tutorial Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 June 2008, 23:21:45 UTC |
| 22e801f | Miklos Vajna | 09 June 2008, 20:25:15 UTC | git-read-tree: document -v option. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 June 2008, 22:49:44 UTC |
| 170e095 | Johannes Sixt | 08 June 2008, 14:40:13 UTC | Remove exec bit from builtin-fast-export.c Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 June 2008, 17:48:46 UTC |
| 7064ca5 | Junio C Hamano | 07 June 2008, 18:45:48 UTC | GIT 1.5.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 June 2008, 18:45:48 UTC |
| c0f6dc9 | Lea Wiemann | 05 June 2008, 21:01:38 UTC | git-for-each-ref.txt: minor improvements Rewrapped synopsis and removed wrong asterisk behind --count option; clarified --sort=<key> description for multiple keys; documented that for-each-ref supports not only glob patterns but also prefixes like "refs/heads" as patterns, and that multiple patterns can be given. Signed-off-by: Lea Wiemann <LeWiemann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 June 2008, 15:39:54 UTC |
| a83123d | Björn Steinbrink | 05 June 2008, 23:31:55 UTC | name-rev: Fix segmentation fault when using --all In commit da2478db "describe --always: fall back to showing an abbreviated object name" we lost the check that skips empty entries in the object hash table when iterating over it in cmd_name_rev. That may cause a NULL pointer being handed to show_name(), leading to a segmentation fault. So add that check back again. Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 June 2008, 04:01:45 UTC |
| 4ed19a3 | Michael Dressel | 04 June 2008, 19:06:31 UTC | describe: match pattern for lightweight tags too The <pattern> given "git describe --match" was used only to filter tag objects, and not to filter lightweight tags. This fixes it. [jc: made the log to clarify this is a bugfix, not an enhancement, with additional test] Signed-off-by: Michael Dressel <MichaelTiloDressel@t-online.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 June 2008, 20:08:03 UTC |
| 28bc302 | Junio C Hamano | 28 May 2008, 05:20:53 UTC | GIT 1.5.5.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 05:32:47 UTC |
| d5350fd | Gerrit Pape | 27 May 2008, 08:59:16 UTC | commit --interactive: properly update the index before commiting When adding files through git commit --interactive, and 'quit' afterwards, the message in the editor of the commit message indicates that many (maybe all) files are deleted from the tree. Dismissing that and running git commit afterwards does the right thing. This commit fixes git commit --interactive to properly update the index before commiting. Reported by Jiří Paleček through http://bugs.debian.org/480429 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 05:32:47 UTC |
| 1f684dc | Lea Wiemann | 27 May 2008, 23:25:42 UTC | gitweb: only display "next" links in logs if there is a next page There was a bug in the implementation of the "next" links in format_paging_nav (for log and shortlog), which caused the next links to always be displayed, even if there is no next page. This fixes it. Signed-off-by: Lea Wiemann <LeWiemann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 05:27:30 UTC |
| a17171b | Johannes Sixt | 26 May 2008, 19:09:18 UTC | Revert "filter-branch: subdirectory filter needs --full-history" This reverts commit cfabd6eee1745cfec58cfcb794ce8847e43b888a. I had implemented it without understanding what --full-history does. Consider this history: C--M--N / / / A--B / \ / D-/ where B and C modify a path, X, in the same way so that the result is identical, and D does not modify it at all. With the path limiter X and without --full-history this is simplified to A--B i.e. only one of the paths via B or C is chosen. I had assumed that --full-history would keep both paths like this C--M / / A--B removing the path via D; but in fact it keeps the entire history. Currently, git does not have the capability to simplify to this intermediary case. However, the other extreme to keep the entire history is not wanted either in usual cases. I think we can expect that histories like the above are rare, and in the usual cases we want a simplified history. So let's remove --full-history again. (Concerning t7003, subsequent tests depend on what the test case sets up, so we can't just back out the entire test case.) Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 05:27:30 UTC |
| 049c1ad | Gerrit Pape | 27 May 2008, 08:51:22 UTC | Documentation/git-bundle.txt: fix synopsis The <git-rev-list args> are mandatory to git bundle create, not optional. The usage output of git bundle is already right on this. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 05:01:31 UTC |
| 109440c | Junio C Hamano | 27 May 2008, 02:15:03 UTC | Merge branch 'gp/bisect-fix' into maint * gp/bisect-fix: bisect: print an error message when "git rev-list --bisect-vars" fails git-bisect.sh: don't accidentally override existing branch "bisect" | 27 May 2008, 02:15:03 UTC |
| df2740b | Michele Ballabio | 26 May 2008, 13:24:02 UTC | Documentation: fix graph in git-rev-parse.txt Preformatted html and man pages show a mangled graph, caused by a backslash. Commit f1ec6b22a8c1ab1cca0f1875f85aea5d2434e5a6 fixed this same issue, but it seems that new versions of the Asciidoc toolchain changed their behaviour. Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 May 2008, 02:10:03 UTC |
| f8fcb57 | Junio C Hamano | 26 May 2008, 22:09:51 UTC | show-branch --current: do not barf on detached HEAD The code assumed that there always is the current branch, but the result from resolve_ref() on detached HEAD does not even start with "refs/heads/". Originally noticed and fixed by Stephan Beyer. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 May 2008, 22:09:56 UTC |
| a2f5be5 | Junio C Hamano | 26 May 2008, 05:34:23 UTC | Merge branch 'jk/maint-send-email-compose' into maint * jk/maint-send-email-compose: send-email: rfc2047-quote subject lines with non-ascii characters send-email: specify content-type of --compose body | 26 May 2008, 05:34:23 UTC |
| 93c7b9c | Junio C Hamano | 26 May 2008, 05:34:20 UTC | Merge branch 'hb/maint-send-email-quote-recipients' into maint * hb/maint-send-email-quote-recipients: Fix recipient santitization | 26 May 2008, 05:34:20 UTC |
| 6abf189 | Junio C Hamano | 26 May 2008, 05:34:05 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: builtin-fast-export: Only output a single parent per line | 26 May 2008, 05:34:05 UTC |
| 5070b49 | Pieter de Bie | 24 May 2008, 23:21:53 UTC | builtin-fast-export: Only output a single parent per line According to the git-fast-import man-page, you can only put a single committish per merge: line, like this: merge :10 merge :11 However, git-fast-export puts all parents on a single line, like this: merge :10 :11 This changes fast-export to output a single parent per line. Otherwise neither git-fast-import nor bzr-fast-import can read its output. [jc: fix-up to remove excess LF in the output that makes fast-import barf] Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 May 2008, 05:26:24 UTC |
| 20bd3b0 | Junio C Hamano | 26 May 2008, 04:11:24 UTC | Release Notes for 1.5.5.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 May 2008, 04:11:24 UTC |
| 77599cc | Junio C Hamano | 23 May 2008, 22:52:43 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref | 23 May 2008, 22:52:43 UTC |
| e00f379 | Johannes Sixt | 23 May 2008, 14:13:05 UTC | rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref The intention of --symbolic-full-name is to not print anything if a revision is not an exact ref. But this command: $ git-rev-parse --symbolic-full-name --not master~1 still emitted a sole '^' to stdout (provided that there's no other ref at master~1). This fixes it. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 22:52:20 UTC |
| 26b4d00 | Heikki Orsila | 22 May 2008, 15:24:41 UTC | Add missing "short" alternative to --date in rev-list-options.txt Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 06:29:46 UTC |
| 3a3e097 | Jon Loeliger | 22 May 2008, 19:59:25 UTC | git-show.txt: Not very stubby these days. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 06:21:30 UTC |
| c30f993 | Shawn O. Pearce | 22 May 2008, 12:47:19 UTC | Clarify repack -n documentation While repacking a local repository a coworker thought the -n option was necessary to git-repack to keep it from updating some unknown file on the central server we all share. Explaining further what the option is (not) doing helps to make it clear the option does not impact any remote repositories the user may have configured. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 06:21:29 UTC |
| 008442f | Junio C Hamano | 21 May 2008, 21:27:59 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: git-am: fix typo in usage message doc/git-daemon: s/uploadarchive/uploadarch/ | 21 May 2008, 21:27:59 UTC |
| 18023c2 | Horst H. von Brand | 28 March 2008, 14:09:04 UTC | Fix recipient santitization Need to quote all special characters, not just the first one Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 May 2008, 20:05:50 UTC |
| d54eaaa | Jeff King | 28 March 2008, 21:29:01 UTC | send-email: rfc2047-quote subject lines with non-ascii characters We always use 'utf-8' as the encoding, since we currently have no way of getting the information from the user. This also refactors the quoting of recipient names, since both processes can share the rfc2047 quoting code. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 May 2008, 20:05:10 UTC |
| 0706bd1 | Jeff King | 28 March 2008, 21:28:33 UTC | send-email: specify content-type of --compose body If the compose message contains non-ascii characters, then we assume it is in utf-8 and include the appropriate MIME headers. If the user has already included a MIME-Version header, then we assume they know what they are doing and don't add any headers. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 May 2008, 20:05:09 UTC |
| e77b0b5 | Jeff King | 19 May 2008, 20:09:06 UTC | git-am: fix typo in usage message Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 May 2008, 05:47:16 UTC |
| 74190d2 | Jeff King | 19 May 2008, 20:08:33 UTC | doc/git-daemon: s/uploadarchive/uploadarch/ The git-daemon upload-archive feature has always used the config directive 'daemon.uploadarch'; the documentation which came later seems to have just mistakenly used the wrong name. Noticed by lionel@over-blog.com. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 May 2008, 05:46:13 UTC |
| e4d594c | Jon Loeliger | 16 May 2008, 19:43:50 UTC | git-filter-branch: Clarify file removal example. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 May 2008, 20:13:24 UTC |
| a473445 | Junio C Hamano | 14 May 2008, 20:46:42 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: Documentation/git-describe.txt: make description more readable | 14 May 2008, 20:46:42 UTC |
| b7893cd | Ian Hilt | 14 May 2008, 18:30:55 UTC | Documentation/git-describe.txt: make description more readable Signed-off-by: Ian Hilt <ian.hilt@gmail.com> Credit-to: Kevin Ballard <kevin@sb.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 May 2008, 18:47:03 UTC |
| 3e08f5d | Junio C Hamano | 11 May 2008, 19:09:12 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: wt-status.h: declare global variables as extern builtin-commit.c: add -u as short name for --untracked-files git-repack: re-enable parsing of -n command line option | 11 May 2008, 19:09:12 UTC |
| 32efcd9 | Johannes Sixt | 09 May 2008, 08:05:27 UTC | wt-status.h: declare global variables as extern There are linkers out there that complain if a global non-static variable is defined multiple times. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 May 2008, 17:04:46 UTC |
| e164590 | Sitaram Chamarty | 09 May 2008, 17:12:55 UTC | builtin-commit.c: add -u as short name for --untracked-files This makes the C code consistent with the documentation and the old shell code. Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 May 2008, 17:04:20 UTC |
| 2b36b14 | A Large Angry SCM | 10 May 2008, 20:52:51 UTC | git-repack: re-enable parsing of -n command line option In commit 5715d0b (Migrate git-repack.sh to use git-rev-parse --parseopt, 2007-11-04), parsing of the '-n' command line option was accidentally lost when git-repack.sh was migrated to use git-rev-parse --parseopt. This adds it back. Signed-off-by: A Large Angry SCM <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 May 2008, 17:03:58 UTC |
| 32a27b5 | Junio C Hamano | 09 May 2008, 03:12:44 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull" doc: clarify definition of "update" for git-add -u | 09 May 2008, 03:12:44 UTC |
| 42ba5ee | Christian Couder | 07 May 2008, 21:54:28 UTC | bisect: print an error message when "git rev-list --bisect-vars" fails Before this patch no error was printed when "git rev-list --bisect-vars" failed. This can happen when bad and good revs are mistaken. This patch prints an error message on stderr that describe the likely failure cause. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 May 2008, 00:50:00 UTC |
| 15ddb6f | Dustin Sallings | 08 May 2008, 18:28:07 UTC | Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull" Signed-off-by: Dustin Sallings <dustin@spy.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 May 2008, 19:15:30 UTC |
| afd899e | Jeff King | 08 May 2008, 17:25:06 UTC | doc: clarify definition of "update" for git-add -u The "-u" option is described only in terms of "updating" files, which in turn is described only as "similar to what git commit -a does". Let's be a little more specific about what updating entails. Suggested by Geoffrey Irving. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 May 2008, 19:09:42 UTC |
| ee831f7 | Gerrit Pape | 05 May 2008, 07:43:00 UTC | git-bisect.sh: don't accidentally override existing branch "bisect" If a branch named "bisect" or "new-bisect" already was created in the repo by other means than git bisect, doing a git bisect used to override the branch without a warning. Now if the branch "bisect" or "new-bisect" already exists, and it was not created by git bisect itself, git bisect start fails with an appropriate error message. Additionally, if checking out a new bisect state fails due to a merge problem, git bisect cleans up the temporary branch "new-bisect". The accidental override has been noticed by Andres Salomon, reported through http://bugs.debian.org/478647 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2008, 00:18:20 UTC |
| 6233a52 | Junio C Hamano | 04 May 2008, 01:55:33 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: filter-branch: Documentation fix. | 04 May 2008, 01:55:33 UTC |
| 2788631 | Jeff King | 02 May 2008, 14:05:36 UTC | checkout: don't rfc2047-encode oneline on detached HEAD When calling pretty_print_commit, there is an implicit assumption that passing in a non-NULL "subject" variable for oneline or email formats means that the output is part of a subject and therefore "subject" to rfc2047 encoding. This is not the desired effect when reporting the movement of detached HEAD. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 May 2008, 01:47:18 UTC |
| a174889 | Florian Ragwitz | 30 April 2008, 07:47:43 UTC | filter-branch: Documentation fix. It's --msg-filter, not --message-filter. Signed-off-by: Florian Ragwitz <rafl@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 May 2008, 19:05:21 UTC |
| 2d8bed9 | Junio C Hamano | 30 April 2008, 18:42:05 UTC | fetch-pack: brown paper bag fix When I applied Linus's patch from the list by hand somehow I ended up reversing the logic by mistake. This fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 April 2008, 18:42:05 UTC |
| 30c0312 | Junio C Hamano | 30 April 2008, 05:55:07 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: cvsimport: always pass user data to "system" as a list fix reflog approxidate parsing bug | 30 April 2008, 05:55:07 UTC |
| b3bb5f7 | Jeff King | 30 April 2008, 04:36:14 UTC | cvsimport: always pass user data to "system" as a list This avoids invoking the shell. Not only is it faster, but it prevents the possibility of interpreting our arguments in the shell. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 April 2008, 05:45:27 UTC |
| 861f00e | Jeff King | 30 April 2008, 04:13:58 UTC | fix reflog approxidate parsing bug In get_sha1_basic, we parse a string like HEAD@{10 seconds ago}:path/to/file into its constituent ref, reflog date, and path components. We never actually munge the string itself, but instead keep offsets into the string with their associated lengths. When we call approxidate on the contents inside braces, however, we pass just a string without a length. This means that approxidate could sometimes look past the closing brace and (erroneously) interpret the rest of the string as part of the date. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 April 2008, 05:22:19 UTC |
| 7b7f39e | Alex Riesen | 28 April 2008, 20:23:35 UTC | Fix use after free() in builtin-fetch As reported by Dave Jones: Since master.kernel.org updated to latest, I noticed that I could crash git-fetch by doing this.. export KERNEL=/pub/scm/linux/kernel/git/ git fetch $KERNEL/torvalds/linux-2.6 master:linus (gdb) bt 0 0x000000349fd6d44b in free () from /lib64/libc.so.6 1 0x000000000048f4eb in transport_unlock_pack (transport=0x7ce530) at transport.c:811 2 0x000000349fd31b25 in exit () from /lib64/libc.so.6 3 0x00000000004043d8 in handle_internal_command (argc=3, argv=0x7fffea4449f0) at git.c:379 4 0x0000000000404547 in main (argc=3, argv=0x7fffea4449f0) at git.c:443 5 0x000000349fd1c784 in __libc_start_main () from /lib64/libc.so.6 6 0x0000000000403ef9 in ?? () 7 0x00007fffea4449d8 in ?? () 8 0x0000000000000000 in ?? () I then remembered, my .bashrc has this.. export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) which is handy for showing up such bugs. More info on this glibc feature is at http://udrepper.livejournal.com/11429.html Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 April 2008, 06:57:47 UTC |
| 72269ad | Linus Torvalds | 28 April 2008, 23:27:49 UTC | fetch-pack: do not stop traversing an already parsed commit f3ec549 (fetch-pack: check parse_commit/object results, 2008-03-03) broke common ancestor computation by stopping traversal when it sees an already parsed commit. This should fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 April 2008, 23:27:49 UTC |
| e42251a | Alex Riesen | 28 April 2008, 21:09:55 UTC | Use "=" instead of "==" in condition as it is more portable At least the dash from Ubuntu's /bin/sh says: test: 233: ==: unexpected operator Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 April 2008, 22:03:28 UTC |
| a2b26ac | Junio C Hamano | 23 April 2008, 17:53:47 UTC | clone: detect and fail on excess parameters "git clone [options] $src $dst excess-garbage" simply ignored excess-garbage without giving any diagnostic message. Fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 April 2008, 04:47:39 UTC |
| 5736a37 | Junio C Hamano | 28 April 2008, 04:47:38 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: Remove 'header' from --signoff option description | 28 April 2008, 04:47:38 UTC |
| 362b0dd | Dan McGee | 27 April 2008, 00:43:20 UTC | Remove 'header' from --signoff option description Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 April 2008, 04:46:51 UTC |
| 1ce89cc | Jeff King | 22 April 2008, 11:11:13 UTC | remote: create fetch config lines with '+' Since git-remote always uses remote tracking branches, it should be safe to always force updates of those branches. I.e., we should generate fetch = +refs/heads/*:refs/remotes/$remote/* instead of fetch = refs/heads/*:refs/remotes/$remote/* This was the behavior of the perl version, which seems to have been lost in the C rewrite. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2008, 05:30:31 UTC |
| f8aae12 | Jeff King | 23 April 2008, 09:16:06 UTC | push: allow unqualified dest refspecs to DWIM Previously, a push like: git push remote src:dst would go through the following steps: 1. check for an unambiguous 'dst' on the remote; if it exists, then push to that ref 2. otherwise, check if 'dst' begins with 'refs/'; if it does, create a new ref 3. otherwise, complain because we don't know where in the refs hierarchy to put 'dst' However, in some cases, we can guess about the ref type of 'dst' based on the ref type of 'src'. Specifically, before complaining we now check: 2.5. if 'src' resolves to a ref starting with refs/heads or refs/tags, then prepend that to 'dst' So now this creates a new branch on the remote, whereas it previously failed with an error message: git push master:newbranch Note that, by design, we limit this DWIM behavior only to source refs which resolve exactly (including symrefs which resolve to existing refs). We still complain on a partial destination refspec if the source is a raw sha1, or a ref expression such as 'master~10'. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2008, 05:13:24 UTC |
| 31c6390 | Junio C Hamano | 25 April 2008, 04:50:48 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: t5516: remove ambiguity test (1) Linked glossary from cvs-migration page write-tree: properly detect failure to write tree objects | 25 April 2008, 04:50:48 UTC |
| 3ffb58b | Jeff King | 24 April 2008, 01:28:36 UTC | doc/git-gc: add a note about what is collected It seems to be a FAQ that people try running git-gc, and then get puzzled about why the size of their .git directory didn't change. This note mentions the reasons why things might unexpectedly get kept. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2008, 04:50:19 UTC |
| 3ef6a1f | Jeff King | 23 April 2008, 09:21:45 UTC | t5516: remove ambiguity test (1) This test tried to push into a remote with ambiguous refs in remotes/$x/master and remotes/$y/master. However, the remote never actually tells us about the refs/remotes hierarchy, so we don't even see this ambiguity. The test happened to pass because we were simply looking for failure, and the test fails for another reason: the dst refspec does not exist and does not begin with refs/, making it invalid. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 17:56:07 UTC |
| 837f3b7 | Matt Graham | 23 April 2008, 13:13:51 UTC | Linked glossary from cvs-migration page Coming from CVS, I found the git glossary vital to learning git and learning how terms in git correlate to the cvs terminology with which I am familiar. This patch links the glossary from the cvs-migration page so cvs users will be able to fine the glossary as soon as they start looking at git documents. Signed-off-by: Matt Graham <mdg149@gmail.com> Acked-by: J. Bruce Fields <bfields@fieldses.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 17:54:43 UTC |
| edae5f0 | Junio C Hamano | 23 April 2008, 16:47:17 UTC | write-tree: properly detect failure to write tree objects Tomasz Fortuna reported that "git commit" does not error out properly when it cannot write tree objects out. "git write-tree" shares the same issue, as the failure to notice the error is deep in the logic to write tree objects out recursively. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 17:02:44 UTC |
| d6958a1 | Junio C Hamano | 23 April 2008, 06:37:06 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: svn-git: Use binmode for reading/writing binary rev maps diff options documentation: refer to --diff-filter in --name-status git-svn bug with blank commits and author file archive.c: format_subst - fixed bogus argument to memchr copy.c: copy_fd - correctly report write errors gitattributes: Fix subdirectory attributes specified from root directory | 23 April 2008, 06:37:06 UTC |
| 491b1b1 | Sam Vilain | 21 April 2008, 03:31:24 UTC | Amend git-push refspec documentation These paragraphs are a little confusing. Also, make it clearer when you have to specify the full name for <dst> Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 06:01:48 UTC |
| 208641c | Dmitry Potapov | 14 April 2008, 12:17:31 UTC | git-gc --prune is deprecated 25ee9731c137d0a24b0f4879eb0b0cce9b77d5b0 made the '--prune' option deprecated and removed its description from the git-gc man page. This patch removes all references to this option from the rest of the Git documentation. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:53:37 UTC |
| 4f7ec79 | Michael Weber | 18 April 2008, 13:12:04 UTC | svn-git: Use binmode for reading/writing binary rev maps Otherwise, there is a possible interaction with UTF-8 locales in combination with PERL_UNICODE, resulting in "inconsistent size: 40" or "read:"-type errors. See also: perldoc -f binmode <http://perldoc.perl.org/perl581delta.html#UTF-8-no-longer-default-under-UTF-8-locales> Signed-off-by: Michael Weber <michaelw@foldr.org> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:43:58 UTC |
| a6f47b2 | Miklos Vajna | 22 April 2008, 12:23:48 UTC | diff options documentation: refer to --diff-filter in --name-status git diff --name-status outputs letters, but the meaning of those letters is documented elsewhere. Add a note to make the manpage more intuitive. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:42:38 UTC |
| 34b5cd1 | Jeff King | 22 April 2008, 10:41:47 UTC | Don't force imap.host to be set when imap.tunnel is set The documentation for git-imap-send suggests a tunnel setting such as Tunnel = "ssh -q user@server.com /usr/bin/imapd ./Maildir 2> /dev/null" which works wonderfully and doesn't require a username, password or port setting. However, git-imap-send currently requires that the imap.host variable be set in the config even when it was unused. This patch changes imap-send to only require that the imap.host setting is set if imap.tunnel is not set. Otherwise, server.host is set to "tunnel" for reporting purposes. Acked-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:42:23 UTC |
| 2498a1a | Brandon Casey | 03 April 2008, 18:26:13 UTC | git-clone.txt: Adjust note to --shared for new pruning behavior of git-gc Since git-gc now always calls prune, even with --auto, unreferenced objects may be removed by more operations than just git-gc. This is important for clones created using --shared or --reference. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:40:44 UTC |
| 9231f50 | Thomas Guyot-Sionnest | 22 April 2008, 10:07:47 UTC | git-svn bug with blank commits and author file When trying to import from svn using an author file, git-svn bails out if it encounters a blank author. The attached patch changes this behavior and allow using the author file with blanks authors. I came across this bug while importing from a cvs2svn repo where the initial revision (1) has a blank author. This doesn't break the behavior of bailing out when an unknown author is encountered. Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:39:10 UTC |
| 75b7dfb | Ariel Badichi | 23 April 2008, 01:06:27 UTC | archive.c: format_subst - fixed bogus argument to memchr Also removed a superfluous test. Signed-off-by: Ariel Badichi <abadichi@bezeqint.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:23:16 UTC |
| 8b1f6de | Ariel Badichi | 23 April 2008, 01:05:29 UTC | copy.c: copy_fd - correctly report write errors Previously, the errno could have been lost due to an intervening close() call. This patch also contains minor cosmetic changes. Signed-off-by: Ariel Badichi <abadichi@bezeqint.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:21:08 UTC |
| 82881b3 | Matthew Ogilvie | 22 April 2008, 18:19:12 UTC | gitattributes: Fix subdirectory attributes specified from root directory Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2008, 04:12:37 UTC |
| 71bd81a | Andy Parkins | 21 April 2008, 13:44:44 UTC | post-receive-email: fix accidental removal of a trailing space in signature line post-receive-email adds a signature to the end of emails in generate_email_footer(). The signature was separated from the main email body using the standard string "-- ". (see RFC 3676) a6080a0 (War on whitespace, 2007-06-07) removed the trailing whitespace from "-- ", leaving it as "--", which is not a correct signature separator. This patch restores the missing space, but does it in a way that will not set off the trailing whitespace alarms. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2008, 06:36:56 UTC |
| 85d17a1 | martin f. krafft | 20 April 2008, 21:23:38 UTC | Escape project names before creating pathinfo URLs If a project name contains special URL characters like +, gitweb's links break in subtle ways. The solution is to pass the project name through esc_url() and using the return value. Signed-off-by: martin f. krafft <madduck@madduck.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2008, 06:30:55 UTC |
| bbd4c30 | martin f. krafft | 20 April 2008, 21:03:56 UTC | Escape project name in regexp The project name, when used in a regular expression, needs to be quoted properly, so that stuff like '++' in the project name does not cause Perl to barf. Related info: http://bugs.debian.org/476076 This is a bug in Perl's CGI.pm, but fixing that exposed a similar bug in gitweb.perl Signed-off-by: martin f. krafft <madduck@madduck.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2008, 06:30:11 UTC |
| f457413 | Teemu Likonen | 20 April 2008, 19:32:47 UTC | bash: Add completion for git diff --base --ours --theirs Signed-off-by: Teemu Likonen <tlikonen@iki.fi> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2008, 05:52:15 UTC |
| 37152d8 | Gerrit Pape | 21 April 2008, 18:15:52 UTC | diff-options.txt: document the new "--dirstat" option This commit adds the documentation for the new option added by 7df7c01 (Add "--dirstat" for some directory statistics, 2008-02-12). Noticed by Clint Adams, reported through http://bugs.debian.org/476437 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2008, 05:50:21 UTC |
| 66aaa2f | Junio C Hamano | 20 April 2008, 18:36:53 UTC | GIT 1.5.5.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2008, 18:36:53 UTC |
| 41a3e3a | Junio C Hamano | 20 April 2008, 06:01:51 UTC | Merge branch 'jc/maint-rebase-am' into maint * jc/maint-rebase-am: rebase: do not munge commit log message Conflicts: git-am.sh | 20 April 2008, 06:01:51 UTC |
| 5634cf2 | Jakub Narebski | 13 April 2008, 12:12:15 UTC | gitweb: Fix 'history' view for deleted files with history When asked for history of a file which is not present in given branch ("HEAD", i.e. current branch, or given by transient $hash_hase ('hb') parameter), but is present deeper in the history (meaning that "git rev-list --full-history $hash_base -- $file_name" is not empty), and there is no $hash ('h') parameter set for a file, gitweb would spew multiple of "Use of uninitialized value" warnings, and some links would be missing. This commit fixes this bug. This bug occurs in the rare cases when "git log -- <path>" is empty and "git log --full-history -- <path>" is not, or to be more exact in the cases when full-history starts later than given branch. It can happen if you are using handcrafted gitwb URL, or if you follow generic 'history' link or bookmark for a file which got deleted. Gitweb tried to get file type ('tree', or 'blob', or even 'commit') from the commit we start searching from (where the file was not present), and not among found commits. This was the cause of "Use of uninitialized value" warnings. This commit also add tests for such situation to t9500 test. While we are it, return HTTP error if there is _no_ history; it means that file or directory was not found (for given branch). Also error out if type of item could not be found: it should not happen now, but better be sure. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 April 2008, 05:10:38 UTC |
| f01f815 | Matthieu Moy | 13 April 2008, 13:38:21 UTC | Document that WebDAV doesn't need git on the server, and works over SSL I managed to set up a Git repository on a preconfigured WebDAV server, and using HTTPS, without installing Git on it or changing the server configuration. This works through a proxy too. This patch reflects this (it previously stated that Git was _necessary_ on the server, which isn't true). Also give a few hints to troubleshoting. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 April 2008, 05:09:24 UTC |
| 4c414e2 | Junio C Hamano | 19 April 2008, 05:07:00 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: am: POSIX portability fix | 19 April 2008, 05:07:00 UTC |
| 24b6177 | Jonas Fonseca | 13 April 2008, 09:56:54 UTC | git-remote: reject adding remotes with invalid names This can happen if the arguments to git-remote add is switched by the user, and git would only show an error if fetching was also requested. Fix it by using the refspec parsing engine to check if the requested name can be parsed as a remote before add it. Also cleanup so that the "remote.<name>.url" config name buffer is only initialized once. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2008, 23:31:27 UTC |
| 29df238 | Junio C Hamano | 18 April 2008, 23:11:40 UTC | am: POSIX portability fix POSIX allows echo without flag to interpret specials such as \n, and we tried to make things portable by using printf instead where it matters. Recently added code to "git am" had unprotected "echo", which was caught by t4014 and Rémi Vanicat. This should fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2008, 23:11:40 UTC |
| d0ab520 | Junio C Hamano | 17 April 2008, 00:04:05 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: git-am: minor cleanup Clarify and fix English in "git-rm" documentation | 17 April 2008, 00:04:05 UTC |
| 11dc4e7 | Junio C Hamano | 16 April 2008, 23:46:26 UTC | git-am: minor cleanup This moves the assignment to FIRSTLINE down so that we do not have to have multiple copies. Suggested by Linus. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 23:46:26 UTC |
| 25dc720 | Jon Loeliger | 16 April 2008, 23:41:27 UTC | Clarify and fix English in "git-rm" documentation Do some verb-noun agreement changes. Clarify some file globbing cases. Fixed a wrong statement in an example. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 23:45:23 UTC |
| 5e835ca | Junio C Hamano | 16 April 2008, 19:50:48 UTC | rebase: do not munge commit log message Traditionally git-rebase was implemented in terms of "format-patch" piped to "am -3", to strike balance between speed (because it avoids a rather expensive read-tree/merge-recursive machinery most of the time) and flexibility (the magic "-3" allows it to fall back to 3-way merge as necessary). However, this combination has one flaw when dealing with a nonstandard commit log message format that has more than one lines in the first paragraph. This teaches "git am --rebasing" to take advantage of the fact that the mbox message "git rebase" prepares for it records the original commit object name, to get the log message from the original commit object instead. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2008, 19:50:48 UTC |
| 464509f | Junio C Hamano | 16 April 2008, 07:37:33 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: git-bisect: make "start", "good" and "skip" succeed or fail atomically git-am: cope better with an empty Subject: line Ignore leading empty lines while summarizing merges bisect: squelch "fatal: ref HEAD not a symref" misleading message builtin-apply: Show a more descriptive error on failure when opening a patch Clarify documentation of git-cvsserver, particularly in relation to git-shell | 16 April 2008, 07:37:33 UTC |
