Skip to main content

Browse the archive

swh:1:snp:bb8853bfef8fcf2b1d37fd6404912c7606c98e48
sort by:
Revision Author Date Message Commit Date
78e3118 Junio C Hamano 04 July 2008, 08:12:54 UTC GIT 1.5.6.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 July 2008, 08:38:41 UTC
2b2828b Junio C Hamano 04 July 2008, 08:38:34 UTC Fix executable bits in t/ scripts Pointed out by Ramsay Jones. Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 July 2008, 08:38:41 UTC
f444e52 Junio C Hamano 04 July 2008, 07:37:40 UTC Work around gcc warnings from curl headers After master.k.org upgrade, I started seeing these warning messages: transport.c: In function 'get_refs_via_curl': transport.c:458: error: call to '_curl_easy_setopt_err_write_callback' declared with attribute warning: curl_easy_setopt expects a curl_write_callback argument for this option It appears that the curl header wants to enforce the function signature for callback function given to curl_easy_setopt() to be compatible with that of (*curl_write_callback) or fwrite. This patch seems to work the issue around. Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 July 2008, 07:37:40 UTC
182c5af Junio C Hamano 03 July 2008, 04:32:44 UTC Merge branch 'js/maint-clone-insteadof' into maint * js/maint-clone-insteadof: clone: respect the settings in $HOME/.gitconfig and /etc/gitconfig clone: respect url.insteadOf setting in global configs 03 July 2008, 04:32:44 UTC
1f42b8e Junio C Hamano 03 July 2008, 04:32:44 UTC Merge branch 'jk/maint-fetch-ref-hier' into maint * jk/maint-fetch-ref-hier: fetch: give a hint to the user when local refs fail to update fetch: report local storage errors in status table 03 July 2008, 04:32:44 UTC
4df0d7a Junio C Hamano 03 July 2008, 04:32:44 UTC Merge branch 'jc/maint-reset' into maint * jc/maint-reset: Allow "git-reset path" when unambiguous 03 July 2008, 04:32:44 UTC
14d4642 Shawn O. Pearce 03 July 2008, 02:32:45 UTC Fix describe --tags --long so it does not segfault If we match a lightweight (non-annotated tag) as the name to output and --long was requested we do not have a tag, nor do we have a tagged object to display. Instead we must use the object we were passed as input for the long format display. Reported-by: Mark Burton <markb@ordern.com> Backtraced-by: Mikael Magnusson <mikachu@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 03 July 2008, 04:21:59 UTC
7ad0f27 Junio C Hamano 02 July 2008, 00:09:21 UTC Start draft release notes for 1.5.6.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 July 2008, 00:09:21 UTC
4f3dcc2 Thomas Rast 01 July 2008, 09:47:04 UTC Fix 'git show' on signed tag of signed tag of commit The cmd_show loop resolves tags by showing them, then pointing the object to the 'tagged' member. However, this object is not fully initialized; it only contains the SHA1. (This resulted in a segfault if there were two levels of tags.) We apply parse_object to get a full object. Noticed by Kalle Olavi Niemitalo on IRC. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 July 2008, 00:05:42 UTC
f3cb169 Jeff King 27 June 2008, 04:01:41 UTC fetch: give a hint to the user when local refs fail to update There are basically two categories of update failures for local refs: 1. problems outside of git, like disk full, bad permissions, etc. 2. D/F conflicts on tracking branch ref names In either case, there should already have been an error message. In case '1', hopefully enough information has already been given that the user can fix it. In the case of '2', we can hint that the user can clean up their tracking branch area by using 'git remote prune'. Note that we don't actually know _which_ case we have, so the user will receive the hint in case 1, as well. In this case the suggestion won't do any good, but hopefully the user is smart enough to figure out that it's just a hint. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 June 2008, 06:47:41 UTC
a0d2ceb Jeff King 30 June 2008, 03:27:45 UTC doc/rev-parse: clarify reflog vs --until for specifying revisions The rev-parse manpage introduces the branch@{date} syntax, and mentions the reflog specifically. However, new users may not be familiar with the distinction between the reflog and the commit date, so let's help them out with a "you may be interested in --until" pointer. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 June 2008, 06:47:26 UTC
5b8063b Johannes Schindelin 27 June 2008, 12:55:23 UTC clone: respect the settings in $HOME/.gitconfig and /etc/gitconfig After initializing the config in the newly-created repository, we need to unset GIT_CONFIG so that the global configs are read again. Noticed by Pieter de Bie. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 June 2008, 06:16:32 UTC
7829f20 Eric Wong 29 June 2008, 03:40:32 UTC git-svn: don't sanitize remote names in config The original sanitization code was just taken from the remotes2config.sh shell script in contrib. Credit to Avery Pennarun for noticing this mistake, and Junio for clarifying the rules for config section names: Junio C Hamano wrote in <7vfxr23s6m.fsf@gitster.siamese.dyndns.org>: > In > > [foo "bar"] baz = value > > foo and baz must be config.c::iskeychar() (and baz must be isalpha()), but > "bar" can be almost anything. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 June 2008, 03:55:45 UTC
29c70e0 Avery Pennarun 28 June 2008, 23:33:56 UTC git-svn: avoid filling up the disk with temp files. Commit ffe256f9bac8a40ff751a9341a5869d98f72c285 ("git-svn: Speed up fetch") introduced changes that create a temporary file for each object fetched by svn. These files should be deleted automatically, but perl apparently doesn't do this until the process exits (or perhaps when its garbage collector runs). This means that on a large fetch, especially with lots of branches, we sometimes fill up /tmp completely, which prevents the next temp file from being written completely. This is aggravated by the fact that a new temp file is created for each updated file, even if that update produces a file identical to one already in git. Thus, it can happen even if there's lots of disk space to store the finished repository. We weren't adequately checking for write errors, so this would result in an invalid file getting committed, which caused git-svn to fail later with an invalid checksum. This patch adds a check to syswrite() so similar problems don't lead to corruption in the future. It also unlink()'s each temp file explicitly when we're done with it, so the disk doesn't need to fill up. Signed-off-by: Avery Pennarun <apenwarr@gmail.com> Tested-by: Björn Steinbrink <B.Steinbrink@gmx.de> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 June 2008, 02:57:22 UTC
5b8a94b Björn Steinbrink 29 June 2008, 01:21:25 UTC git cat-file: Fix memory leak in batch mode When run in batch mode, git cat-file never frees the memory for the blob contents it is printing. This quickly adds up and causes git-svn to be hardly usable for imports of large svn repos, because it uses cat-file in batch mode and cat-file's memory usage easily reaches several hundred MB without any good reason. Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 June 2008, 02:50:56 UTC
762656e Joey Hess 28 June 2008, 20:02:47 UTC fix git config example syntax git-config expects a space, not '=' between option and value. Also, quote the value since it contains globs, which some shells will not pass through unchanged, or will abort if the glob doesn't expand. Signed-off-by: Joey Hess <joey@kitenet.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 June 2008, 20:43:22 UTC
74d817c Jochen Voss 28 June 2008, 16:04:24 UTC avoid off-by-one error in run_upload_archive Make sure that buf has enough space to store the trailing \0 of the command line argument, too. Signed-off-by: Jochen Voss <voss@seehuhn.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 June 2008, 20:43:21 UTC
6315472 Jeff King 27 June 2008, 03:59:50 UTC fetch: report local storage errors in status table Previously, if there was an error while storing a local tracking ref, the low-level functions would report an error, but fetch's status output wouldn't indicate any problem. E.g., imagine you have an old "refs/remotes/origin/foo/bar" but upstream has deleted "foo/bar" in favor of a new branch "foo". You would get output like this: error: there are still refs under 'refs/remotes/origin/foo' From $url_of_repo * [new branch] foo -> origin/foo With this patch, the output takes into account the status of updating the local ref: error: there are still refs under 'refs/remotes/origin/foo' From $url_of_repo ! [new branch] foo -> origin/foo (unable to update local ref) Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 June 2008, 23:22:51 UTC
bc0c0d8 Johannes Schindelin 27 June 2008, 12:56:05 UTC clone: respect url.insteadOf setting in global configs When we call "git clone" with a url that has a rewrite rule in either $HOME/.gitconfig or /etc/gitconfig, the URL can be different from what the command line expects it to be. So, let's use the URL as the remote structure has it, not the literal string from the command line. Noticed by Pieter de Bie. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 June 2008, 23:21:19 UTC
7ac749c Junio C Hamano 27 June 2008, 01:08:51 UTC Merge branch 'maint-1.5.5' into maint * maint-1.5.5: GIT 1.5.5.5 GIT 1.5.4.6 git-shell: accept "git foo" form Conflicts: GIT-VERSION-GEN RelNotes 27 June 2008, 01:08:51 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
18374e5 Junio C Hamano 26 June 2008, 20:16:33 UTC diff --check: do not discard error status upon seeing a good line "git diff --check" should return non-zero when there was any whitespace error but the code only paid attention to the error status of the last new line in the patch. Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 June 2008, 20:26:25 UTC
dfc8f39 Junio C Hamano 26 June 2008, 01:16:36 UTC Allow "git-reset path" when unambiguous Resetting a selected set of index entries is done with "git reset -- paths" syntax, but we did not allow -- to be omitted even when the command is unambiguous. This updates the command to follow the general rule: * When -- appears, revs come before it, and paths come after it; * When there is no --, earlier ones are revs and the rest are paths, and we need to guess. When lack of -- marker forces us to guess, we protect from user errors and typoes by making sure what we treat as revs do not appear as filenames in the work tree, and what we treat as paths do appear as filenames in the work tree, and by erroring out if that is not the case. We tell the user to disambiguate by using -- in such a case. which is employed elsewhere in the system. When this rule is applied to "reset", because we can have only zero or one rev to the command, the check can be slightly simpler than other programs. We have to check only the first one or two tokens after the command name and options, and when they are: -- A: no explicit rev given; "A" and whatever follows it are paths. A --: explicit rev "A" given and whatever follows the "--" are paths. A B: "A" could be rev or path and we need to guess. "B" could be missing but if exists that (and everything that follows) would be paths. So we apply the guess only in the last case and only to "A" (not "B" and what comes after it). * As long as "A" is unambiguously a path, index entries for "A", "B" (and everything that follows) are reset to the HEAD revision. * If "A" is unambiguously a rev, on the other hand, the index entries for "B" (and everything that follows) are reset to the "A" revision. Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 June 2008, 01:16:36 UTC
e636106 Junio C Hamano 26 June 2008, 00:09:40 UTC GIT 1.5.6.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 June 2008, 00:13:48 UTC
df79b9f Dmitry Potapov 25 June 2008, 08:26:55 UTC fix update-hook-example to work with packed tag references The update-hook-example used 'test -f' to check the tag present, which does not work if the checked reference is packed. This check has been changed to use 'git rev-parse $tag' instead. Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 June 2008, 19:44:32 UTC
2beebd2 Jeff King 25 June 2008, 05:41:34 UTC clone: create intermediate directories of destination repo The shell version used to use "mkdir -p" to create the repo path, but the C version just calls "mkdir". Let's replicate the old behavior. We have to create the git and worktree leading dirs separately; while most of the time, the worktree dir contains the git dir (as .git), the user can override this using GIT_WORK_TREE. We can reuse safe_create_leading_directories, but we need to make a copy of our const buffer to do so. Since merge-recursive uses the same pattern, we can factor this out into a global function. This has two other cleanup advantages for merge-recursive: 1. mkdir_p wasn't a very good name. "mkdir -p foo/bar" actually creates bar, but this function just creates the leading directories. 2. mkdir_p took a mode argument, but it was completely ignored. Acked-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 June 2008, 18:44:15 UTC
4ace4fc Junio C Hamano 25 June 2008, 18:20:01 UTC Merge branch 'jc/maint-combine-diff-pre-context' into maint * jc/maint-combine-diff-pre-context: diff -c/--cc: do not include uninteresting deletion before leading context 25 June 2008, 18:20:01 UTC
41cb0fc Junio C Hamano 25 June 2008, 18:19:33 UTC Merge branch 'lt/maint-gitdir-relative' into maint * lt/maint-gitdir-relative: Make git_dir a path relative to work_tree in setup_work_tree() 25 June 2008, 18:19:33 UTC
340a6b5 Junio C Hamano 25 June 2008, 18:18:39 UTC Merge branch 'sb/maint-rebase' into maint * sb/maint-rebase: git-rebase.sh: Add check if rebase is in progress 25 June 2008, 18:18:39 UTC
87412ec Jeff King 25 June 2008, 16:08:15 UTC for-each-ref: implement missing tag values The "type" and "object" fields for tags were accepted as valid atoms, but never implemented. Consequently, they simply returned the empty string, even for valid tags. Noticed by Lea Wiemann. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 June 2008, 18:05:26 UTC
74b1e12 Jan Krüger 24 June 2008, 00:17:36 UTC git-svn: make rebuild respect rewriteRoot option Suppose someone fetches git-svn-ified commits from another repo and then attempts to use 'git-svn init --rewrite-root=foo bar'. Using git svn rebase after that will fail badly: * For each commit tried by working_head_info, rebuild is called indirectly. * rebuild will iterate over all commits and skip all of them because the URL does not match. Because of that no rev_map file is generated at all. * Thus, rebuild will run once for every commit. This takes ages. * In the end there still isn't any rev_map file and thus working_head_info fails. Addressing this behaviour fixes an apparently not too uncommon problem with providing git-svn mirrors of Subversion repositories. Some repositories are accessed using different URLs depending on whether the user has push privileges or not. In the latter case, an anonymous URL is often used that differs from the push URL. Providing a mirror that is usable in both cases becomes a lot more possible with this change. Signed-off-by: Jan Krüger <jk@jk.gs> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 June 2008, 00:38:08 UTC
6ff6af6 Patrick Higgins 23 June 2008, 21:33:41 UTC Workaround for AIX mkstemp() The AIX mkstemp will modify it's template parameter to an empty string if the call fails. This caused a subsequent mkdir to fail. Signed-off-by: Patrick Higgins <patrick.higgins@cexp.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 June 2008, 23:13:38 UTC
010a2da Stephan Beyer 22 June 2008, 15:04:26 UTC Extend parse-options test suite This patch serves two purposes: 1. test-parse-option.c should be a more complete example for the parse-options API, and 2. there have been no tests for OPT_CALLBACK, OPT_DATE, OPT_BIT, OPT_SET_INT and OPT_SET_PTR before. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 June 2008, 01:15:18 UTC
224712e Stephan Beyer 22 June 2008, 15:04:25 UTC api-parse-options.txt: Introduce documentation for parse options API Add some documentation of basics, macros and callback implementation of the parse-options API. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 June 2008, 01:14:58 UTC
6422f63 Michele Ballabio 22 June 2008, 14:39:04 UTC parse-options.c: fix documentation syntax of optional arguments When an argument for an option is optional, short options don't need a space between the option and the argument, and long options need a "=". Otherwise, arguments are misinterpreted. Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 June 2008, 01:14:37 UTC
82936f2 Stephan Beyer 21 June 2008, 23:54:36 UTC api-builtin.txt: update and fix typo Mention NEED_WORK_TREE flag and command-list.txt. Fix "bulit-in" typo and AsciiDoc-formatting of a paragraph. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 June 2008, 01:14:17 UTC
cd5320f Stephan Beyer 22 June 2008, 14:07:02 UTC git-rebase.sh: Add check if rebase is in progress "git rebase --continue" and friends gave nonsense errors when there is no rebase in progress. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 June 2008, 01:09:15 UTC
044bbbc Linus Torvalds 19 June 2008, 19:34:06 UTC Make git_dir a path relative to work_tree in setup_work_tree() Once we find the absolute paths for git_dir and work_tree, we can make git_dir a relative path since we know pwd will be work_tree. This should save the kernel some time traversing the path to work_tree all the time if git_dir is inside work_tree. Daniel's patch didn't apply for me as-is, so I recreated it with some differences, and here are the numbers from ten runs each. There is some IO for me - probably due to more-or-less random flushing of the journal - so the variation is bigger than I'd like, but whatever: Before: real 0m8.135s real 0m7.933s real 0m8.080s real 0m7.954s real 0m7.949s real 0m8.112s real 0m7.934s real 0m8.059s real 0m7.979s real 0m8.038s After: real 0m7.685s real 0m7.968s real 0m7.703s real 0m7.850s real 0m7.995s real 0m7.817s real 0m7.963s real 0m7.955s real 0m7.848s real 0m7.969s Now, going by "best of ten" (on the assumption that the longer numbers are all due to IO), I'm saying a 7.933s -> 7.685s reduction, and it does seem to be outside of the noise (ie the "after" case never broke 8s, while the "before" case did so half the time). So looks like about 3% to me. Doing it for a slightly smaller test-case (just the "arch" subdirectory) gets more stable numbers probably due to not filling the journal with metadata updates, so we have: Before: real 0m1.633s real 0m1.633s real 0m1.633s real 0m1.632s real 0m1.632s real 0m1.630s real 0m1.634s real 0m1.631s real 0m1.632s real 0m1.632s After: real 0m1.610s real 0m1.609s real 0m1.610s real 0m1.608s real 0m1.607s real 0m1.610s real 0m1.609s real 0m1.611s real 0m1.608s real 0m1.611s where I'ld just take the averages and say 1.632 vs 1.610, which is just over 1% peformance improvement. So it's not in the noise, but it's not as big as I initially thought and measured. (That said, it obviously depends on how deep the working directory path is too, and whether it is behind NFS or something else that might need to cause more work to look up). Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 June 2008, 23:44:21 UTC
3b2bbe9 Jan Krüger 19 June 2008, 22:41:42 UTC Documentation: fix formatting in git-svn Due to a misplaced list block separator, general hints about the config file options got indented at the same level as the description of the last option, making it easy to miss them. Signed-off-by: Jan Krüger <jk@jk.gs> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 June 2008, 23:30:26 UTC
e200783 Brandon Casey 19 June 2008, 17:32:02 UTC t7502-commit.sh: test_must_fail doesn't work with inline environment variables When the arguments to test_must_fail() begin with a variable assignment, test_must_fail() attempts to execute the variable assignment as a command. This fails, and so test_must_fail returns with a successful status value without running the command it was intended to test. For example, the following script: #!/bin/sh test_must_fail () { "$@" test $? -gt 0 -a $? -le 129 } foo='wo adrian' test_must_fail foo='yo adrian' sh -c 'echo foo: $foo' always exits zero and prints the message: test.sh: line 3: foo=yo adrian: command not found Test 16 calls test_must_fail in such a way and therefore has not been testing whether git 'do[es] not fire editor in the presence of conflicts'. A workaround is to set and export the variable in a normal way, not using one-shot notation. Because this would affect the remainder of the process, the test is done inside a subshell. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 June 2008, 23:07:06 UTC
20827d9 Dan McGee 19 June 2008, 21:15:53 UTC completion: add --graph to log command completion Signed-off-by: Dan McGee <dpmcgee@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 June 2008, 23:02:31 UTC
037e98f Brandon Casey 18 June 2008, 20:16:08 UTC git-merge.sh: fix typo in usage message: sucesses --> succeeds Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 June 2008, 21:13:02 UTC
c86fbe5 Junio C Hamano 19 June 2008, 06:59:41 UTC diff -c/--cc: do not include uninteresting deletion before leading context When we include a few uninteresting lines before the interesting ones as context, we are only interested in seeing the surviving lines themselves and not the deleted lines that are before them. Mark the added leading context lines in give_context() and not show deleted lines form them. Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 June 2008, 06:59:41 UTC
e449f10 Junio C Hamano 18 June 2008, 20:09:43 UTC GIT 1.5.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 June 2008, 20:09:43 UTC
9a7bbd1 Jeff King 16 June 2008, 16:15:02 UTC clean up error conventions of remote.c:match_explicit match_explicit is called for each push refspec to try to fully resolve the source and destination sides of the refspec. Currently, we look at each refspec and report errors on both the source and the dest side before aborting. It makes sense to report errors for each refspec, since an error in one is independent of an error in the other. However, reporting errors on the 'dst' side of a refspec if there has been an error on the 'src' side does not necessarily make sense, since the interpretation of the 'dst' side depends on the 'src' side (for example, when creating a new unqualified remote ref, we use the same type as the src ref). This patch lets match_explicit return early when the src side of the refspec is bogus. We still look at all of the refspecs before aborting the push, though. At the same time, we clean up the call signature, which previously took an extra "errs" flag. This was pointless, as we didn't act on that flag, but rather just passed it back to the caller. Instead, we now use the more traditional "return -1" to signal an error, and the caller aggregates the error count. This change fixes two bugs, as well: - the early return avoids a segfault when passing a NULL matched_src to guess_ref() - the check for multiple sources pointing to a single dest aborted if the "err" flag was set. Presumably the intent was not to bother with the check if we had no matched_src. However, since the err flag was passed in from the caller, we might abort the check just because a previous refspec had a problem, which doesn't make sense. In practice, this didn't matter, since due to the error flag we end up aborting the push anyway. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 June 2008, 19:39:13 UTC
8c6b578 Olivier Marin 17 June 2008, 16:34:57 UTC Fix approxidate("never") to always return 0 Commit af66366a9feb0194ed04b1f538998021ece268a8 introduced the keyword "never" to be used with approxidate() but defined it with a fixed date without taking care of timezone. As a result approxidate() will return a timestamp in the future with a negative timezone. With this patch, approxidate("never") always return 0 whatever your timezone is. Signed-off-by: Olivier Marin <dkr@freesurf.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 June 2008, 23:40:09 UTC
1d9b265 Alejandro Mery 17 June 2008, 11:43:57 UTC git-am: head -1 is obsolete and doesn't work on some new systems head -<n> was deprecated by POSIX, and as modern versions of coreutils package don't support it at least one exports _POSIX2_VERSION=199209 it's fails on some systems. head -n<n> is portable, but sed <n>q is even more. Signed-off-by: Alejandro Mery <amery@geeks.cl> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 June 2008, 23:40:09 UTC
1a8fb15 Junio C Hamano 17 June 2008, 07:23:31 UTC builtin-rerere: fix a small leak The data read from MERGE_RR file is kept in path-list by hanging textual 40-byte conflict signature to path of the blob that contains the conflict. The signature is strdup'ed twice, and the second copy is given to the path-list, leaking the first copy. Signed-off-by: Junio C Hamano <junio@pobox.com> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> 17 June 2008, 23:39:59 UTC
61fb0b7 Lea Wiemann 17 June 2008, 06:25:28 UTC gitweb: remove unused parse_ref method The parse_ref method became unused in cd1464083c, but the author decided to leave it in. Now it gets in the way of refactoring, so let's remove it. Signed-off-by: Lea Wiemann <LeWiemann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 June 2008, 23:39:18 UTC
516381d Lea Wiemann 17 June 2008, 21:46:35 UTC gitweb: quote commands properly when calling the shell This eliminates the function git_cmd_str, which was used for composing command lines, and adds a quote_command function, which quotes all of its arguments (as in quote.c). Signed-off-by: Lea Wiemann <LeWiemann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 June 2008, 23:39:09 UTC
79c6dca Junio C Hamano 17 June 2008, 05:19:00 UTC sha1_file.c: simplify parse_pack_index() It was implemented as a thin wrapper around an otherwise unused helper function parse_pack_index_file(). The code becomes simpler and easier to read by consolidating the two. Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 June 2008, 05:19:00 UTC
3bfaf01 Junio C Hamano 17 June 2008, 05:02:12 UTC create_tempfile: make sure that leading directories can be accessible by peers In a shared repository, we should make sure adjust_shared_perm() is called after creating the initial fan-out directories under objects/ directory. Earlier an logico called the function only when mkdir() failed; we should do so when mkdir() succeeded. Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 June 2008, 05:02:12 UTC
1421c5f Linus Torvalds 17 June 2008, 00:17:10 UTC write_loose_object: don't bother trying to read an old object Before even calling this, all callers have done a "has_sha1_file(sha1)" or "has_loose_object(sha1)" check, so there is no point in doing a second check. If something races with us on object creation, we handle that in the final link() that moves it to the right place. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 June 2008, 04:46:47 UTC
328a475 Miklos Vajna 15 June 2008, 12:06:43 UTC path-list documentation: document all functions and data structures Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 June 2008, 04:32:22 UTC
9e18522 Miklos Vajna 14 June 2008, 01:01:59 UTC run-command documentation: fix "memset()" parameter When initializing the struct async and struct child_process structures, the documentation suggested "clearing" the structure with '0' instead of '\0'. It is enough to use integer zero here. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 June 2008, 04:31:17 UTC
5f54de5 Junio C Hamano 17 June 2008, 00:39:50 UTC Merge branch 'maint' * maint: diff.c: fix emit_line() again not to add extra line 17 June 2008, 00:39:50 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
9dc784a Junio C Hamano 16 June 2008, 23:14:22 UTC Merge branch 'maint' * maint: diff: reset color before printing newline 16 June 2008, 23:14:22 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
336d09d Pierre Habouzit 15 June 2008, 21:37:42 UTC Make git reflog expire honour core.sharedRepository. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 June 2008, 22:54:06 UTC
4744d72 Junio C Hamano 15 June 2008, 20:47:14 UTC Update RPM spec to drop curl executable requirement Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 June 2008, 20:47:14 UTC
1d53f90 Johan Herland 15 June 2008, 10:16:01 UTC The "curl" executable is no longer required git-clone.sh was the last user of the "curl" executable. Relevant git commands now use libcurl instead. This should be reflected in the install requirements. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 June 2008, 20:44:44 UTC
d0594be Junio C Hamano 15 June 2008, 20:43:32 UTC Makefile: update check-docs target Earlier series to rename documentation pages around did not update this target and left check-docs broken. This should fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 June 2008, 20:43:32 UTC
8da1e21 Johan Herland 15 June 2008, 10:14:12 UTC Consistency: Use "libcurl" instead of "cURL library" and "curl" Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 June 2008, 20:35:10 UTC
b96317f Johan Herland 15 June 2008, 10:13:22 UTC cpio is no longer used by git-clone Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 June 2008, 20:34:32 UTC
5570406 Christian Couder 15 June 2008, 13:39:20 UTC Documentation: RelNotes-1.5.6: talk about renamed HTML files Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 June 2008, 20:33:48 UTC
52cb2bc Junio C Hamano 14 June 2008, 19:57:18 UTC GIT 1.5.6-rc3 Just a lot of small fixes, mostly documentation. Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 June 2008, 21:39:22 UTC
c529d75 Linus Torvalds 14 June 2008, 18:43:01 UTC Simplify and rename find_sha1_file() Now that we've made the loose SHA1 file reading more careful and streamlined, we only use the old find_sha1_file() function for checking whether a loose object file exists at all. As such, the whole 'return stat information' part of it was just pointless (nobody cares any more), and the naming of the function is not really all that relevant either. So simplify it to not do a 'stat()', but just an existence check (which is what the callers want), and rename it to 'has_loose_object()' which matches the use. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 June 2008, 21:39:22 UTC
44d1c19 Linus Torvalds 14 June 2008, 18:32:37 UTC Make loose object file reading more careful We used to do 'stat()+open()+mmap()+close()' to read the loose object file data, which does work fine, but has a couple of problems: - it unnecessarily walks the filename twice (at 'stat()' time and then again to open it) - NFS generally has open-close consistency guarantees, which means that the initial 'stat()' was technically done outside of the normal consistency rules. So change it to do 'open()+fstat()+mmap()+close()' instead, which avoids both these issues. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 June 2008, 21:39:22 UTC
5723fe7 Linus Torvalds 14 June 2008, 17:50:12 UTC Avoid cross-directory renames and linking on object creation Instead of creating new temporary objects in the top-level git object directory, create them in the same directory they will finally end up in anyway. This avoids making the final atomic "rename to stable name" operation be a cross-directory event, which makes it a lot easier for various filesystems. Several filesystems do things like change the inode number when moving files across directories (or refuse to do it entirely). In particular, it can also cause problems for NFS implementations that change the filehandle of a file when it moves to a different directory, like the old user-space NFS server did, and like the Linux knfsd still does if you don't export your filesystems with 'no_subtree_check' or if you export a filesystem that doesn't have stable inode numbers across renames). This change also obviously implies creating the object fan-out subdirectory at tempfile creation time, rather than at the final move_temp_to_file() time. Which actually accounts for most of the size of the patch. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 June 2008, 21:39:22 UTC
9adefee Jakub Narebski 14 June 2008, 18:14:12 UTC Use 'trash directory' thoroughly in t/test-lib.sh ...also in comments. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 June 2008, 20:00:01 UTC
7c1a9e7 Mike Hommey 14 June 2008, 10:02:22 UTC Don't allocate too much memory in quote_ref_url In c13b263, http_fetch_ref got "refs/" included in the ref passed to it, which, incidentally, makes the allocation in quote_ref_url too big, now. Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 June 2008, 19:53:09 UTC
66115d3 Jakub Narebski 14 June 2008, 18:37:59 UTC gitweb: Make it work with $GIT containing spaces This fixes single point where $GIT (which can contain full path to git binary) with embedded spaces gave errors. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 June 2008, 19:48:06 UTC
1d284cb SZEDER Gábor 14 June 2008, 09:48:01 UTC completion: add more 'git add' options Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 June 2008, 19:47:44 UTC
69c61c4 SZEDER Gábor 14 June 2008, 09:48:00 UTC git add: add long equivalents of '-u' and '-f' options The option -u stands for --update and it is a good idea to make it clear especially because this is the only mode of operation of "git add" that does something different from "adding". Give longer --force synonym to -f while we are at it as well. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 June 2008, 19:47:31 UTC
b994ec1 Junio C Hamano 14 June 2008, 18:48:59 UTC Merge branch 'rs/attr' * rs/attr: Ignore .gitattributes in bare repositories 14 June 2008, 18:48:59 UTC
c8c6a2e Avery Pennarun 12 June 2008, 23:10:51 UTC git-svn: test that extra blank lines aren't inserted in commit messages. Improve the git-svn-author test to check that extra newlines aren't inserted into commit messages as they take a round trip from git to svn and back. We test both with and without the --add-author-from option to git-svn. git-svn: test that svn repo doesn't have extra newlines. Signed-off-by: Avery Pennarun <apenwarr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 June 2008, 18:47:56 UTC
328eb9b Avery Pennarun 12 June 2008, 23:10:50 UTC git-svn: don't append extra newlines at the end of commit messages. In git, all commits end in exactly one newline character. In svn, commits end in zero or more newlines. Thus, when importing commits from svn into git, git-svn always appends two extra newlines to ensure that the git-svn-id: line is separated from the main commit message by at least one blank line. Combined with the terminating newline that's always present in svn commits produced by git, you usually end up with two blank lines instead of one between the commit message and git-svn-id: line, which is undesirable. Instead, let's remove all trailing whitespace from the git commit on the way through to svn. Signed-off-by: Avery Pennarun <apenwarr@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 June 2008, 18:47:55 UTC
8e7e6f3 Mark Levedahl 14 June 2008, 17:09:41 UTC git-submodule - Fix errors regarding resolve_relative_url git-submodule was invoking "die" from within resolve-relative-url, but this does not actually cause the script to exit. Fix this by returning the error to the caller and have the caller exit. While we're at it, clean up the quoting on invocation of resolve_relative_url as it was wrong. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 June 2008, 18:34:00 UTC
65e73db Christian Couder 14 June 2008, 07:21:36 UTC documentation: bisect: remove bits talking about a bisection branch ... because we are now bisecting using a detached HEAD. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 June 2008, 17:52:57 UTC
6483925 Junio C Hamano 14 June 2008, 06:00:51 UTC sha1_file.c: dead code removal write_sha1_from_fd() and write_sha1_to_fd() were dead code nobody called, neither the latter's helper repack_object() was. Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 June 2008, 06:00:51 UTC
43d60d2 Flavio Poletti 12 June 2008, 21:54:55 UTC git-instaweb: improve auto-discovery of httpd and call conventions. This patch allows calling: git-instaweb -d apache2 and have the script Do The Right Thing. In particular, the auto-discovery mechanism has been extended in order to be used for module listing as well, and the call convention is that if the daemon is apache2/lighttpd and the parameter to the "-d" option does not end by "-f", the "-f" is added to the end of the option itself. Change all backticks to $( ... ) as per Documentation/CodingGuidelines. Signed-off-by: Flavio Poletti <flavio@polettix.it> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 June 2008, 05:08:30 UTC
d88593f Junio C Hamano 14 June 2008, 00:16:02 UTC t4126: fix test that happened to work due to timing The test did "reset --hard" (where the HEAD commit has an empty blob at path "empty") followed by "> empty", expecting that the index does not notice the file _changed_ since git wrote it out upon "reset" if the redirection is done quickly enough. There was no need to do the emptying, and it gave a wrong result if "reset --hard" happened on time T and then ">empty" happened on the next second T+1. This fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 June 2008, 05:07:34 UTC
dc92cc2 Junio C Hamano 13 June 2008, 05:55:44 UTC Merge branch 'om/remote-fix' * om/remote-fix: "remote prune": be quiet when there is nothing to prune remote show: list tracked remote branches with -n remote prune: print the list of pruned branches builtin-remote: split show_or_prune() in two separate functions remote show: fix the -n option 13 June 2008, 05:55:44 UTC
d8933f0 Shawn O. Pearce 13 June 2008, 04:38:55 UTC fast-export: Correctly generate initial commits with no parents If we are exporting a commit which has no parents we may be doing it to a branch that already exists, causing fast-import to assume the branch's current revision should be the sole parent of the new commit. This can cause `git fast-export | git fast-import` to produce an incorrect graph for: A-------M----o------o refs/heads/master / B-+ In this graph A and B are initial commits (no parents) but if A was output first to refs/heads/master and then B is output fast-import would assume the graph was this instead: A-------M----o------o refs/heads/master \ / +-B-+ Which would cause B, M, and all later commits to have a different SHA-1, and obviously be quite a different graph. Sending a reset command prior to B informs fast-import to clear the implied parent of A, allowing B to remain an initial commit. Reported-by: Ben Lynn <benlynn@gmail.com> Deemed-obviously-correct-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 June 2008, 05:42:20 UTC
7b7b451 Lea Wiemann 12 June 2008, 22:35:59 UTC t/.gitattributes: only ignore whitespace errors in test files Only ignore whitespace errors in t/tNNNN-*.sh and the t/tNNNN subdirectories. Other files (like test libraries) should still be checked. Also fix a whitespace error in t/test-lib.sh. Signed-off-by: Lea Wiemann <LeWiemann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 June 2008, 05:22:55 UTC
fa5b4f3 Jeff King 12 June 2008, 06:14:28 UTC document --pretty=tformat: option This was introduced in 4da45bef, but never documented anywhere. Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 June 2008, 05:22:36 UTC
fe22e54 Chris Ridd 11 June 2008, 13:09:19 UTC Improve sed portability The behaviour of "sed" on an incomplete line is unspecified by POSIX, and On Solaris it apparently fails to process input that doesn't end in a LF. Consequently constructs like re=$(printf '%s' foo | sed -e 's/bar/BAR/g' $) cause re to be set to the empty string. Such a construct is used in git-submodule.sh. Because the LF at the end of command output are stripped away by the command substitution, it is a safe and sane change to add a LF at the end of the printf format specifier. Signed-off-by: Chris Ridd <chris.ridd@isode.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 June 2008, 05:20:18 UTC
4209752 Junio C Hamano 12 June 2008, 21:30:37 UTC user-manual: describe how higher stages are set during a merge Higher stages store the blobs involved from their side verbatim. Removal of uninteresting hunks are done by "diff --cc" upon demand and not stored in the index. Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 June 2008, 21:30:51 UTC
9501fc8 Geoffrey Irving 12 June 2008, 14:29:42 UTC doc: adding gitman.info and *.texi to .gitignore Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 June 2008, 21:28:53 UTC
5ada369 Junio C Hamano 12 June 2008, 21:21:05 UTC Documentation: exclude @pxref{[REMOTES]} from texinfo intermediate output We already had a hack to exclude @pxref{[URLS]} from the texi stream that refers to nonexistent anchor. This allows "make info" to produce gitman.info again. Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 June 2008, 21:21:05 UTC
6bfa3c9 Junio C Hamano 12 June 2008, 21:19:09 UTC Documentation/git-pull.txt: Use more standard [NOTE] markup Unlike other manual pages (e.g. git-blame.txt), this used *NOTE:* to show a side note headed with boldface string "NOTE". Use a paragraph headed by [NOTE] like others instead. Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 June 2008, 21:19:09 UTC
8b7d4e7 Junio C Hamano 12 June 2008, 06:43:25 UTC "remote prune": be quiet when there is nothing to prune The previous commit made it always say "Pruning $remote" but reported the URL only when there is something to prune. Make it consistent by not saying anything at all when there is nothing to prune. Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 June 2008, 06:43:25 UTC
97fc865 Mikael Magnusson 12 June 2008, 02:38:38 UTC Typo in RelNotes. Signed-off-by: Mikael Magnusson <mikachu@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 June 2008, 05:18:09 UTC
196821f Junio C Hamano 11 June 2008, 23:22:53 UTC Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Handle detached heads better 11 June 2008, 23:22:53 UTC
8de7e9c Junio C Hamano 11 June 2008, 23:21:56 UTC Merge branch 'maint' * maint: fix typo in tutorial 11 June 2008, 23:21:56 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
back to top