| 50a4b35 | Paul Jarc | 05 January 2009, 02:27:41 UTC | configure clobbers LDFLAGS In a couple of tests, configure clobbers the LDFLAGS value set by the caller. This patch fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2009, 03:46:19 UTC |
| 0ddd93b | Henrik Austad | 05 January 2009, 15:25:37 UTC | Be consistent in switch usage for tar tar handles switches with and witout preceding '-', but the documentation should be consistent nonetheless. Signed-off-by: Henrik Austad <henrik@austad.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2009, 20:04:23 UTC |
| c7719fb | Henrik Austad | 05 January 2009, 15:25:36 UTC | Use capitalized names where appropriate The Linux kernel and Emacs are both spelled capitalized Signed-off-by: Henrik Austad <henrik@austad.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2009, 20:04:02 UTC |
| dcfdbdf | Miklos Vajna | 03 January 2009, 03:59:12 UTC | fast-export: print usage when no options specified Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2009, 22:24:15 UTC |
| d99bf51 | jidanni@jidanni.org | 27 December 2008, 19:49:03 UTC | Documentation/git-tag.txt: minor typo and grammar fix Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 January 2009, 13:33:35 UTC |
| 936b705 | Junio C Hamano | 29 December 2008, 09:17:34 UTC | Prepare for v1.6.1.1 maintenance release Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2008, 09:17:34 UTC |
| a9e67c8 | jidanni@jidanni.org | 29 December 2008, 07:03:17 UTC | Documentation/diff-options.txt: unify options Instead of listing short option (e.g. "-U<n>") as a shorthand for its longer counterpart (e.g. "--unified=<n>"), list the synonyms together. It saves one indirection to find what the reader wants. Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2008, 09:08:02 UTC |
| fb3bb3d | Devin Doucette | 27 December 2008, 09:39:31 UTC | gitweb: Fix export check in git_get_projects_list When $filter was empty, the path passed to check_export_ok would contain an extra '/', which some implementations of export_auth_hook are sensitive to. It makes more sense to fix this here than to handle the special case in each implementation of export_auth_hook. Signed-off-by: Devin Doucette <devin@doucette.cc> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2008, 06:34:03 UTC |
| a9012e3 | Junio C Hamano | 27 December 2008, 22:22:37 UTC | Merge branch 'rs/maint-tformat-foldline' into maint * rs/maint-tformat-foldline: pretty: support multiline subjects with format: pretty: factor out format_subject() pretty: factor out skip_empty_lines() | 27 December 2008, 22:22:37 UTC |
| f611c8c | Junio C Hamano | 27 December 2008, 22:21:24 UTC | Merge branch 'rs/maint-retval-fix' into maint * rs/maint-retval-fix: merge-file: handle freopen() failure daemon: cleanup: factor out xstrdup_tolower() daemon: cleanup: replace loop with if daemon: handle freopen() failure | 27 December 2008, 22:21:24 UTC |
| fcd3549 | Junio C Hamano | 27 December 2008, 22:21:15 UTC | Merge branch 'sp/maint-describe-all-tag-warning' into maint * sp/maint-describe-all-tag-warning: describe: Avoid unnecessary warning when using --all | 27 December 2008, 22:21:15 UTC |
| f83b9ba | Adeodato Simó | 27 December 2008, 08:50:30 UTC | git-send-email.txt: move --format-patch paragraph to a proper location When introducing --format-patch, its documentation was accidentally inserted in the middle of documentation for --validate. Signed-off-by: Adeodato Simó <dato@net.com.org.es> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 21:54:00 UTC |
| 3a882d9 | Adeodato Simó | 27 December 2008, 18:23:30 UTC | git-shortlog.txt: improve documentation about .mailmap files The description on .mailmap made it seem like they are only useful for commits with a wrong address for an author, but they are about fixing the real name. Explain this better in the text, and replace the existing example with a new one that hopefully makes things clearer. Signed-off-by: Adeodato Simó <dato@net.com.org.es> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 21:52:19 UTC |
| f53bd74 | René Scharfe | 27 December 2008, 00:49:21 UTC | pretty: support multiline subjects with format: git log --pretty=format:%s (and tformat:) used to display the first line of the subject, unlike the other --pretty options, which would construct a subject line from all lines of the first paragraph of the commit message. For consistency and increased code reuse, change format: to do the same as the other options. Before: $ git log --pretty=oneline v1.6.1 | md5sum 7c0896d2a94fc3315a0372b9b3373a8f - $ git log --pretty=tformat:"%H %s" v1.6.1 | md5sum 298903b1c065002e15daa5329213c51f - After: $ git log --pretty=tformat:"%H %s" v1.6.1 | md5sum 7c0896d2a94fc3315a0372b9b3373a8f - $ git log --pretty=oneline v1.6.1 | md5sum 7c0896d2a94fc3315a0372b9b3373a8f - Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 20:02:49 UTC |
| 88c4473 | René Scharfe | 27 December 2008, 00:39:35 UTC | pretty: factor out format_subject() The next patch will use it. In the version that was factored out, we can't rely on the len of the struct strbuf to find out if a line separator needs to be added, as it might already contain something. Add a guard variable ("first") instead. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 20:02:40 UTC |
| a010966 | René Scharfe | 27 December 2008, 00:32:49 UTC | pretty: factor out skip_empty_lines() The patch after the next one will use it. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 20:02:32 UTC |
| 4deba8b | René Scharfe | 26 December 2008, 10:17:04 UTC | merge-file: handle freopen() failure Report the error if redirection of stderr to /dev/null failed. This silences a compiler warning about ignoring the return value of freopen() on Ubuntu 8.10. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 03:10:02 UTC |
| 6720e95 | René Scharfe | 26 December 2008, 10:12:15 UTC | daemon: cleanup: factor out xstrdup_tolower() Add xstrdup_tolower(), a helper to get a lower case copy of a string, and use it in two cases. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 03:09:56 UTC |
| a583971 | René Scharfe | 26 December 2008, 10:01:57 UTC | daemon: cleanup: replace loop with if Replace a loop around an enter_repo() call, which was used to retry a single time with a different parameter in case the first call fails, with two calls and an if. This is shorter and cleaner. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 03:08:32 UTC |
| c569b1f | René Scharfe | 26 December 2008, 09:46:25 UTC | daemon: handle freopen() failure Die if stderr couldn't be sent to /dev/null when operating in inetd mode and report the error message from the OS. This fixes a compiler warning about the return value of freopen() being ignored on Ubuntu 8.10. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 03:07:56 UTC |
| 81dc223 | Shawn O. Pearce | 26 December 2008, 22:02:01 UTC | describe: Avoid unnecessary warning when using --all In 212945d4 ("Teach git-describe to verify annotated tag names before output") git-describe learned how to output a warning if an annotated tag object was matched but its internal name doesn't match the local ref name. However, "git describe --all" causes the local ref name to be prefixed with "tags/", so we need to skip over this prefix before comparing the local ref name with the name recorded inside of the tag object. Patch-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 00:37:53 UTC |
| 8104ebf | Junio C Hamano | 25 December 2008, 03:41:08 UTC | GIT 1.6.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 December 2008, 03:41:08 UTC |
| 768c728 | Junio C Hamano | 24 December 2008, 08:14:14 UTC | Merge branch 'js/rebase-i-p' * js/rebase-i-p: rebase -i -p: leave a --cc patch when a merge could not be redone rebase -i -p: Fix --continue after a merge could not be redone Show a failure of rebase -p if the merge had a conflict | 24 December 2008, 08:14:14 UTC |
| 4fb1a19 | Johannes Schindelin | 22 December 2008, 21:16:51 UTC | rebase -i -p: leave a --cc patch when a merge could not be redone The result is easier to review this way, and the merge resolution has to be done inside the work tree, not by adjusting "the patch" anyway. | 24 December 2008, 08:14:08 UTC |
| c66c0cb | Miklos Vajna | 23 December 2008, 01:09:24 UTC | t9129: skip the last three tests if UTF-8 locale is not available Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 December 2008, 02:11:33 UTC |
| 779e3a8 | Junio C Hamano | 22 December 2008, 03:20:21 UTC | GIT 1.6.1-rc4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2008, 03:20:21 UTC |
| f66bc5f | Richard Hartmann | 21 December 2008, 23:17:32 UTC | Always show which directory is not a git repository Unify all fatal: Not a git repository error messages so they include path information. Signed-off-by: Richard Hartmann <richih@net.in.tum.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2008, 02:46:41 UTC |
| 5fdb709 | Richard Hartmann | 21 December 2008, 22:28:25 UTC | Make help entries alphabetical Signed-off-by: Richard Hartmann <richih@net.in.tum.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2008, 02:45:05 UTC |
| 71cbf77 | Junio C Hamano | 22 December 2008, 02:35:54 UTC | Merge branch 'maint' * maint: doc/git-fsck: change the way for getting heads' SHA1s | 22 December 2008, 02:35:54 UTC |
| b80b5d6 | Boyd Stephen Smith Jr | 22 December 2008, 00:26:03 UTC | git-revert documentation: refer to new HOWTO on reverting faulty merges Signed-off-by: Boyd Stephen Smith Jr <bss@iguanasuicide.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2008, 02:34:49 UTC |
| d5be89d | Robin Rosenberg | 21 December 2008, 22:17:12 UTC | git-revert: record the parent against which a revert was made As described in Documentation/howto/revert-a-faulty-merge.txt, re-merging from a previously reverted a merge of a side branch may need a revert of the revert beforehand. Record against which parent the revert was made in the commit, so that later the user can figure out what went on. Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2008, 02:32:04 UTC |
| 834caf9 | Junio C Hamano | 22 December 2008, 02:31:12 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Force the focus to the main window on Windows gitk: Allow unbalanced quotes/braces in commit headers gitk: Update German translation gitk: Mark forgotten strings (header sentence parts in color chooser) for translation gitk: Ensure that "Reset branch" menu entry is enabled gitk: Use check-buttons' -text property instead of separate labels gitk: Map / to focus the search box gitk: Fix bugs in blaming code | 22 December 2008, 02:31:12 UTC |
| e4df519 | Johannes Sixt | 18 December 2008, 07:30:49 UTC | gitk: Force the focus to the main window on Windows On msysGit, the focus is first on the (Tk) console. This console is then hidden, but keeps the focus. Work around that by forcing the focus onto the gitk window. This fixes msysGit issue 14. Diagnosed and originally fixed by Johannes Schindelin. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Paul Mackerras <paulus@samba.org> | 21 December 2008, 23:16:18 UTC |
| 61f57cb | Kevin Ballard | 18 December 2008, 09:26:48 UTC | gitk: Allow unbalanced quotes/braces in commit headers When parsing commits, gitk treats the headers of the commit as tcl lists. This causes errors if the header contains an unbalanced quote or open brace. Splitting the line on spaces allows us to treat it as a set of words instead of as a tcl list, which prevents errors. Signed-off-by: Kevin Ballard <kevin@sb.org> Signed-off-by: Paul Mackerras <paulus@samba.org> | 21 December 2008, 23:16:18 UTC |
| 48027a9 | Christian Stimming | 06 December 2008, 19:49:24 UTC | gitk: Update German translation Attached to avoid whitespace problems. Regards, Christian From 282060ac531fee722142f9d39c4ff29570723cbb Mon Sep 17 00:00:00 2001 From: Christian Stimming <stimming@tuhh.de> Date: Sat, 6 Dec 2008 20:47:15 +0100 Subject: [PATCH 2/2] gitk: Update German translation Merged with most recent "make update-po" result. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Paul Mackerras <paulus@samba.org> | 21 December 2008, 23:16:18 UTC |
| 968b016 | Christian Stimming | 06 December 2008, 19:48:30 UTC | gitk: Mark forgotten strings (header sentence parts in color chooser) for translation Signed-off-by: Paul Mackerras <paulus@samba.org> | 21 December 2008, 23:16:18 UTC |
| da12e59 | Johannes Sixt | 03 December 2008, 12:43:20 UTC | gitk: Ensure that "Reset branch" menu entry is enabled Consider this sequence of events: 1. Detach HEAD and fire up gitk 2. Call the context menu on some commit. Notice that the last menu entry says "Detached HEAD: can't reset" and it is disabled. 3. Now checkout some regular branch (e.g. 'master') using the context menu. 4. Call the context menu again on some commit. Previously, at this point the last menu entry said "Reset master branch to here", but it was still disabled. With this fix it is now enabled again. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Paul Mackerras <paulus@samba.org> | 21 December 2008, 23:16:17 UTC |
| adcbec1 | Johannes Sixt | 02 December 2008, 20:42:16 UTC | gitk: Use check-buttons' -text property instead of separate labels Previously the check-buttons' labels in the Preferences were separate widgets. This had the disadvantage that in order to toggle the check-button with the mouse the check-box had to be clicked. With this change the check-box can also be toggled by clicking the label. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Paul Mackerras <paulus@samba.org> | 21 December 2008, 23:16:17 UTC |
| 97bed03 | Giuseppe Bilotta | 02 December 2008, 01:19:22 UTC | gitk: Map / to focus the search box The / key is often used to initiate searches (less, vim, some web browsers). This changes the binding for the / (slash) key from 'find next' to 'focus the search box' to follow this convention. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 21 December 2008, 23:16:17 UTC |
| 27c03aa | Markus Heidelberg | 21 December 2008, 16:30:22 UTC | doc/git-fsck: change the way for getting heads' SHA1s The straightforward way with using 'cat .git/refs/heads/*' doesn't work with packed refs as well as branches of the form topic/topic1. So let's use git-for-each-ref for getting the heads' SHA1s in this example. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 20:04:12 UTC |
| b3eae84 | Markus Heidelberg | 21 December 2008, 10:00:31 UTC | Documentation/git-show-branch: work around "single quote" typesetting glitch The displayed example is typeset with acute accents around the string that should be surrounded by a pair of single quotes in manpage. Replace them with double quotes (the semantics of the example does not change). Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 10:00:31 UTC |
| 2f0e7cb | Junio C Hamano | 21 December 2008, 09:57:59 UTC | send-email: futureproof split_addrs() sub Matt Kraai points out that calling parse_line() assuming that the caller ever passes only one argument is a bug waiting to happen, and he is right. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 09:57:59 UTC |
| 0693f9d | Junio C Hamano | 19 December 2008, 01:31:57 UTC | Make sure lockfiles are unlocked when dying on SIGPIPE We cleaned up lockfiles upon receiving the usual suspects HUP, TERM, QUIT but a wicked user could kill us of asphyxiation by piping our output to a pipe that does not read. Protect ourselves by catching SIGPIPE and clean up the lockfiles as well in such a case. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 09:56:20 UTC |
| c55fae4 | René Scharfe | 21 December 2008, 01:28:48 UTC | fast-import.c: stricter strtoul check, silence compiler warning Store the return value of strtoul() in order to avoid compiler warnings on Ubuntu 8.10. Also check errno after each call, which is the only way to notice an overflow without making ULONG_MAX an illegal date. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 09:48:26 UTC |
| 8f14825 | René Scharfe | 21 December 2008, 01:12:11 UTC | connect.c: stricter port validation, silence compiler warning In addition to checking if the provided port is numeric, also check that the string isn't empty and that the port number is within the valid range. Incidentally, this silences a compiler warning about ignoring strtol's return value. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 09:48:23 UTC |
| a128a2c | Nanako Shiraishi | 20 December 2008, 11:27:02 UTC | Add a documentat on how to revert a faulty merge Linus and Junio explained issues that are involved in reverting a merge and how to continue working with a branch that was updated since such a revert on the mailing list. This is to help new people who did not see these messages. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 09:48:07 UTC |
| 753bc91 | Kirill A. Korinskiy | 20 December 2008, 06:19:46 UTC | Remove the requirement opaquelocktoken uri scheme The program flow of pushing over http is: - call lock_remote() to issue a DAV_LOCK request to the server to lock info/refs and branch refs being pushed into; handle_new_lock_ctx() is used to parse its response to populate "struct remote_lock" that is returned from lock_remote(); - send objects; - call unlock_remote() to drop the lock. The handle_new_lock_ctx() function assumed that the server will use a lock token in opaquelocktoken URI scheme, which may have been an Ok assumption under RFC 2518, but under RFC 4918 which obsoletes the older standard it is not necessarily true. This resulted in push failure (often resulted in "cannot lock existing info/refs" error message) when talking to a server that does not use opaquelocktoken URI scheme. Signed-off-by: Kirill A. Korinskiy <catap@catap.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 09:12:48 UTC |
| 08fc060 | Marcel M. Cary | 15 December 2008, 17:34:37 UTC | git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dir I want directories of my working tree to be linked to from various paths on my filesystem where third-party components expect them, both in development and production environments. A build system's install step could solve this, but I develop scripts and web pages that don't need to be built. Git's submodule system could solve this, but we tend to develop, branch, and test those directories all in unison, so one big repository feels more natural. We prefer to edit and commit on the symlinked paths, not the canonical ones, and in that setting, "git pull" fails to find the top-level directory of the repository while other commands work fine. "git pull" fails because POSIX shells have a notion of current working directory that is different from getcwd(). The shell stores this path in PWD. As a result, "cd ../" can be interpreted differently in a shell script than chdir("../") in a C program. The shell interprets "../" by essentially stripping the last textual path component from PWD, whereas C chdir() follows the ".." link in the current directory on the filesystem. When PWD is a symlink, these are different destinations. As a result, Git's C commands find the correct top-level working tree, and shell scripts do not. Changes: * When interpreting a relative upward (../) path in cd_to_toplevel, prepend the cwd without symlinks, given by /bin/pwd * Add tests for cd_to_toplevel and "git pull" in a symlinked directory that failed before this fix, plus contrasting scenarios that already worked Signed-off-by: Marcel M. Cary <marcel@oak.homeunix.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 09:10:48 UTC |
| f5b49ea | Johannes Sixt | 15 December 2008, 10:05:31 UTC | rebase -i -p: Fix --continue after a merge could not be redone When a merge that has a conflict was rebased, then rebase stopped to let the user resolve the conflicts. However, thereafter --continue failed because the author-script was not saved. (This is rebase -i's way to preserve a commit's authorship.) This fixes it by doing taking the same failure route after a merge that is also taken after a normal cherry-pick. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 09:08:51 UTC |
| 03c4829 | Johannes Sixt | 15 December 2008, 10:05:30 UTC | Show a failure of rebase -p if the merge had a conflict This extends t3409-rebase-preserve-merges by a case where the merge that is rebased has a conflict. Therefore, the rebase stops and expects that the user resolves the conflict. However, currently rebase --continue fails because .git/rebase-merge/author-script is missing. The test script had allocated two identical clones, but only one of them (clone2) was used. Now we use both as indicated in the comment. Also, two instances of && was missing in the setup part. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 09:08:37 UTC |
| 5832d1a | Markus Heidelberg | 19 December 2008, 12:14:18 UTC | Documentation: fix typos, grammar, asciidoc syntax [jc: the original patch was against master but 99% of it applied to maint; this commit splits out the part that applies only to master.] Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2008, 03:37:18 UTC |
| efe05b0 | Junio C Hamano | 20 December 2008, 03:32:29 UTC | Merge branch 'maint' to sync with GIT 1.6.0.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2008, 03:35:55 UTC |
| 718258e | Junio C Hamano | 20 December 2008, 03:27:06 UTC | GIT 1.6.0.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2008, 03:27:35 UTC |
| 88fbf67 | Junio C Hamano | 19 December 2008, 22:41:21 UTC | fast-import: make tagger information optional Even though newer Porcelain tools always record the tagger information when creating new tags, export/import pair should be able to faithfully reproduce ancient tag objects that lack tagger information. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> | 20 December 2008, 03:25:06 UTC |
| 4e46a8d | Johannes Schindelin | 20 December 2008, 00:00:27 UTC | fast-export: deal with tag objects that do not have a tagger When no tagger was found (old Git produced tags like this), no "tagger" line is printed (but this is incompatible with the current git fast-import). Alternatively, you can pass the option --fake-missing-tagger, forcing fast-export to fake a tagger Unspecified Tagger <no-tagger> with a tag date of the beginning of (Unix) time in the case of a missing tagger, so that fast-import is still able to import the result. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2008, 03:11:27 UTC |
| 6727524 | Miklos Vajna | 20 December 2008, 00:52:17 UTC | SubmittingPatches: mention the usage of real name in Signed-off-by: lines Especially with something that is supposed to hopefully have some legal value down the line if somebody starts making noises, it really would be nice to have a real person to associate things with. Suggest this in the SubmittingPatches document. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2008, 03:11:20 UTC |
| ce2c3eb | David Aguilar | 20 December 2008, 01:01:01 UTC | git-mergetool: properly handle "git mergetool -- filename" Like many git commands, git-mergetool allows "--" to signal the end of option processing. This adds a missing "shift" statement so that this is correctly handled. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2008, 03:10:58 UTC |
| 0e73b3e | Wu Fengguang | 19 December 2008, 08:10:10 UTC | git-send-email: handle email address with quoted comma Correctly handle email addresses containing quoted commas, e.g. "Zhu, Yi" <yi.zhu@intel.com>, "Li, Shaohua" <shaohua.li@intel.com> The commas inside the double quotes are not separators. Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2008, 03:10:48 UTC |
| 04c8ce9 | Markus Heidelberg | 19 December 2008, 12:14:18 UTC | Documentation: fix typos, grammar, asciidoc syntax Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2008, 03:10:46 UTC |
| ec9f0ea | Markus Heidelberg | 19 December 2008, 12:14:52 UTC | Documentation: sync example output with git output Don't confuse the user with old git messages. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2008, 19:55:33 UTC |
| 0956a6d | René Scharfe | 18 December 2008, 16:56:51 UTC | Fix type-mismatch compiler warning from diff_populate_filespec() The type of the size member of filespec is ulong, while strbuf_detach expects a size_t pointer. This patch should fix the warning: Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2008, 17:58:40 UTC |
| 32738ed | Michael J Gruber | 18 December 2008, 17:11:18 UTC | test overlapping ignore patterns Add a test which checks that negated patterns such as "!foo.html" can override previous patterns such as "*.html". This is documented behaviour but had not been tested so far. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2008, 17:55:53 UTC |
| c0ceb2c | Junio C Hamano | 18 December 2008, 06:28:03 UTC | Merge branch 'lt/readlink' * lt/readlink: combine-diff.c: use strbuf_readlink() builtin-blame.c: use strbuf_readlink() make_absolute_path(): check bounds when seeing an overlong symlink Make 'prepare_temp_file()' ignore st_size for symlinks Make 'diff_populate_filespec()' use the new 'strbuf_readlink()' Make 'index_path()' use 'strbuf_readlink()' Make 'ce_compare_link()' use the new 'strbuf_readlink()' Add generic 'strbuf_readlink()' helper function | 18 December 2008, 06:28:03 UTC |
| 954597b | Arjen Laarhoven | 17 December 2008, 08:20:25 UTC | Enable threaded delta search on Mac OS X/Darwin Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2008, 06:01:20 UTC |
| ecc03c1 | Nanako Shiraishi | 18 December 2008, 03:34:56 UTC | Clarify documentation of "git checkout <tree-ish> paths" syntax The SYNOPSIS section of the manual writes: git checkout [options] [<tree-ish>] [--] <paths>... but the DESCRIPTION says that this form checks the paths out "from the index, or from a named commit." A later sentence refers to the same argument as "<tree-ish> argument", but it is not clear that these two sentences are talking about the same command line argument for first-time readers. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2008, 06:00:54 UTC |
| b4955fb | Junio C Hamano | 18 December 2008, 05:56:48 UTC | Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui 0.12 git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL git-gui: Update Hungarian translation for 0.12 git-gui: Fixed typos in Swedish translation. git-gui: Updated Swedish translation (515t0f0u). git gui: update Italian translation git-gui: Update Japanese translation for 0.12 git-gui: Starting translation for Norwegian git-gui: Update German (completed) translation. git-gui: Update po template to include 'Mirroring %s' message git-gui: Fix commit encoding handling. git-gui: Fix handling of relative paths in blame. | 18 December 2008, 05:56:48 UTC |
| e612120 | Shawn O. Pearce | 18 December 2008, 04:15:17 UTC | git-gui 0.12 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 18 December 2008, 04:15:17 UTC |
| 1df2713 | Miklos Vajna | 17 December 2008, 21:29:06 UTC | githooks documentation: add a note about the +x mode In a freshly initialized repo it is only necessary to rename the .sample hooks, but when using older repos (initialized with older git init) enabled the +x mode is still necessary - docuement this. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 21:37:14 UTC |
| 912342d | Junio C Hamano | 17 December 2008, 20:37:58 UTC | combine-diff.c: use strbuf_readlink() When showing combined diff using work tree contents, use strbuf_readlink() to read symbolic links. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> | 17 December 2008, 21:36:35 UTC |
| edfd45d | Junio C Hamano | 17 December 2008, 20:37:53 UTC | builtin-blame.c: use strbuf_readlink() When faking a commit out of the work tree contents, use strbuf_readlink() to read the contents of symbolic links. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> | 17 December 2008, 21:36:35 UTC |
| 737e31a | Junio C Hamano | 17 December 2008, 20:37:48 UTC | make_absolute_path(): check bounds when seeing an overlong symlink Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> | 17 December 2008, 21:36:34 UTC |
| dfab6aa | Linus Torvalds | 17 December 2008, 18:31:36 UTC | Make 'prepare_temp_file()' ignore st_size for symlinks The code was already set up to not really need it, so this just massages it a bit to remove the use entirely. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 21:36:34 UTC |
| cf219d8 | Linus Torvalds | 17 December 2008, 18:26:13 UTC | Make 'diff_populate_filespec()' use the new 'strbuf_readlink()' This makes all tests pass on a system where 'lstat()' has been hacked to return bogus data in st_size for symlinks. Of course, the test coverage isn't complete, but it's a good baseline. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 21:36:34 UTC |
| b760d3a | Linus Torvalds | 17 December 2008, 17:51:53 UTC | Make 'index_path()' use 'strbuf_readlink()' This makes us able to properly index symlinks even on filesystems where st_size doesn't match the true size of the link. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 21:36:34 UTC |
| a60272b | Linus Torvalds | 17 December 2008, 17:47:27 UTC | Make 'ce_compare_link()' use the new 'strbuf_readlink()' This simplifies the code, and also makes ce_compare_link now able to handle filesystems with odd 'st_size' return values for symlinks. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 21:36:34 UTC |
| b11b7e1 | Linus Torvalds | 17 December 2008, 17:36:40 UTC | Add generic 'strbuf_readlink()' helper function It was already what 'git apply' did in read_old_data(), just export it as a real function, and make it be more generic. In particular, this handles the case of the lstat() st_size data not matching the readlink() return value properly (which apparently happens at least on NTFS under Linux). But as a result of this you could also use the new function without even knowing how big the link is going to be, and it will allocate an appropriately sized buffer. So we pass in the st_size of the link as just a hint, rather than a fixed requirement. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 21:36:30 UTC |
| d4d1351 | Johannes Schindelin | 14 December 2008, 22:12:49 UTC | git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL In dc871831(Only use GIT_CONFIG in "git config", not other programs), GIT_CONFIG_LOCAL was rested in peace, in favor of not reading /etc/gitconfig and $HOME/.gitconfig at all when GIT_CONFIG is set. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 17 December 2008, 15:50:55 UTC |
| 53682f0 | Markus Heidelberg | 17 December 2008, 02:59:36 UTC | doc/git-reset: add reference to git-stash The "Interrupted workflow" situation is a good example for using git-stash. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 09:16:43 UTC |
| d198367 | Markus Heidelberg | 17 December 2008, 02:59:23 UTC | Documentation: fix description for enabling hooks Since f98f8cb (Ship sample hooks with .sample suffix, 2008-06-24) hooks are not enabled by making them executable anymore, but by removing the '.sample' suffix from the filename. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 08:57:33 UTC |
| 4fce51c | Miklos Vajna | 16 December 2008, 15:48:12 UTC | git-daemon documentation: use {tilde} Use '{tilde}' instead of '~', becase the later does not appear in the manpage version, just in the HTML one. Noticed by gonzzor on IRC. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 08:56:36 UTC |
| b54dc9f | 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. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 07:31:58 UTC |
| 438d299 | Junio C Hamano | 17 December 2008, 06:13:36 UTC | GIT 1.5.6.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 06:13:36 UTC |
| 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 |
| 98171a0 | Lee Marlow | 15 December 2008, 17:45:49 UTC | bash completion: Sync config variables with their man pages Add 'normal' to config color options. Add 'mergeoptions' to branch config options. Add 'proxy' and 'mirror' to remote config options. Signed-off-by: Lee Marlow <lee.marlow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2008, 07:06:17 UTC |
| 025a192 | Lee Marlow | 15 December 2008, 17:45:48 UTC | bash completion: Sort config completion variables Sort the config variables to make sync-ing them with Documents/config.txt easier in the future. Signed-off-by: Lee Marlow <lee.marlow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2008, 07:06:17 UTC |
| 90c3302 | Junio C Hamano | 16 December 2008, 07:06:13 UTC | Merge branch 'maint' * maint: fast-import: close pack before unlinking it pager: do not dup2 stderr if it is already redirected git-show: do not segfault when showing a bad tag | 16 December 2008, 07:06:13 UTC |
| 87c8a56 | Johannes Schindelin | 15 December 2008, 21:11:40 UTC | fast-import: close pack before unlinking it This is sort of a companion patch to 4723ee9(Close files opened by lock_file() before unlinking.): on Windows, you cannot delete what is still open. This makes test 9300-fast-import pass on Windows for me; quite a few fast-imports leave temporary packs until the test "blank lines not necessary after other commands" actually tests for the number of files in .git/objects/pack/, which has a few temporary packs now. I guess that 8b4eb6b(Do not perform cross-directory renames when creating packs) was "responsible" for the breakage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2008, 07:04:48 UTC |
| a833502 | Junio C Hamano | 15 December 2008, 08:33:34 UTC | pager: do not dup2 stderr if it is already redirected An earlier commit 61b8050 (sending errors to stdout under $PAGER, 2008-02-16) avoided losing the error messages that are sent to the standard error when $PAGER is in effect by dup2'ing fd 2 to the pager. his way, showing a tag object that points to a bad object: $ git show tag-foo would give the error message to the pager. However, it was not quite right if the user did: $ git show 2>error.log tag-foo i.e. use the pager but store the errors in a separate file. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2008, 09:37:15 UTC |
| d2dadfe | Junio C Hamano | 15 December 2008, 08:36:56 UTC | git-show: do not segfault when showing a bad tag When a tag points at a bad or nonexistent object, we should diagnose the breakage and exit. An earlier commit 4f3dcc2 (Fix 'git show' on signed tag of signed tag of commit, 2008-07-01) lost this check and made it segfault instead; not good. This fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2008, 09:29:44 UTC |
| 8befc50 | Johannes Schindelin | 14 December 2008, 22:10:52 UTC | Get rid of the last remnants of GIT_CONFIG_LOCAL In dc871831(Only use GIT_CONFIG in "git config", not other programs), GIT_CONFIG_LOCAL was rested in peace, in favor of not reading /etc/gitconfig and $HOME/.gitconfig at all when GIT_CONFIG is set. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2008, 00:43:39 UTC |
| 390c348 | Alexander Gavrilov | 14 December 2008, 19:44:32 UTC | Documentation: Describe git-gui Tools menu configuration options. Now git gui has a customizable Tools menu, so this adds information about variables that are used to configure it. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2008, 00:43:25 UTC |
| 2fad532 | YONETANI Tomokazu | 14 December 2008, 02:08:22 UTC | git-fast-import possible memory corruption problem Internal "allocate in bulk, we will never free this memory anyway" allocator used in fast-import had a logic to round up the size of the requested memory block in a wrong place (it computed if the available space is enough to fit the request first, and then carved a chunk of memory by size rounded up to the alignment, which could go beyond the actually available space). Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2008, 00:41:32 UTC |
| 7e76aba | Markus Heidelberg | 13 December 2008, 19:05:34 UTC | builtin-commit: remove unused message variable builtin-commit uses commit_tree() from builtin-commit-tree since 6bb6b03 (builtin-commit: use commit_tree(), 2008-09-10), where the same message is used. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2008, 20:09:36 UTC |
| 0959df4 | Junio C Hamano | 13 December 2008, 05:50:34 UTC | Merge branch 'maint' * maint: git-config.txt: fix a typo | 13 December 2008, 05:50:34 UTC |
| a126ed0 | Brandon Casey | 12 December 2008, 23:20:07 UTC | git-branch: display sha1 on branch deletion Make it easier to recover from a mistaken branch deletion by displaying the sha1 of the branch's tip commit. Update t3200 test to match the change in output. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2008, 04:42:59 UTC |
| 544ddb0 | Jim Meyering | 12 December 2008, 09:00:41 UTC | git-config.txt: fix a typo Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2008, 04:39:41 UTC |
| de0db42 | Junio C Hamano | 11 December 2008, 08:36:31 UTC | Merge branch 'maint' * maint: fsck: reduce stack footprint make sure packs to be replaced are closed beforehand | 11 December 2008, 08:36:31 UTC |
| 04d3975 | Linus Torvalds | 11 December 2008, 03:44:37 UTC | fsck: reduce stack footprint The logic to mark all objects that are reachable from tips of refs were implemented as a set of recursive functions. In a repository with a deep enough history, this can easily eat up all the available stack space. Restructure the code to require less stackspace by using an object array to keep track of the objects that still need to be processed. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2008, 08:09:48 UTC |
