| e8bd78c | Linus Torvalds | 24 March 2009, 19:31:36 UTC | close_sha1_file(): make it easier to diagnose errors A bug report with "unable to write sha1 file" made us realize that we do not have enough information to guess why close() is failing. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 March 2009, 21:39:20 UTC |
| 720fe22 | Nicolas Pitre | 24 March 2009, 19:56:12 UTC | avoid possible overflow in delta size filtering computation On a 32-bit system, the maximum possible size for an object is less than 4GB, while 64-bit systems may cope with larger objects. Due to this limitation, variables holding object sizes are using an unsigned long type (32 bits on 32-bit systems, or 64 bits on 64-bit systems). When large objects are encountered, and/or people play with large delta depth values, it is possible for the maximum allowed delta size computation to overflow, especially on a 32-bit system. When this occurs, surviving result bits may represent a value much smaller than what it is supposed to be, or even zero. This prevents some objects from being deltified although they do get deltified when a smaller depth limit is used. Fix this by always performing a 64-bit multiplication. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 March 2009, 21:37:30 UTC |
| 3e5970a | David Aguilar | 22 March 2009, 09:15:13 UTC | everyday: use the dashless form of git-init The 'Everyday GIT' guide was using the old dashed form of git-init. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 March 2009, 17:33:36 UTC |
| 688ba09 | Junio C Hamano | 13 March 2009, 04:48:43 UTC | Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.0 * ks/maint-1.6.0-mailinfo-folded: mailinfo: tests for RFC2047 examples mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)' mailinfo: 'From:' header should be unfold as well mailinfo: correctly handle multiline 'Subject:' header | 13 March 2009, 04:48:43 UTC |
| 3e186ef | Junio C Hamano | 13 March 2009, 04:48:26 UTC | Merge branch 'cc/maint-1.6.0-bisect-fix' into maint-1.6.0 * cc/maint-1.6.0-bisect-fix: bisect: fix another instance of eval'ed string bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped | 13 March 2009, 04:48:26 UTC |
| fa711bc | Junio C Hamano | 13 March 2009, 04:48:07 UTC | Merge branch 'fg/maint-1.6.0-exclude-bq' into maint-1.6.0 * fg/maint-1.6.0-exclude-bq: Support "\" in non-wildcard exclusion entries | 13 March 2009, 04:48:07 UTC |
| de55390 | Junio C Hamano | 13 March 2009, 03:01:28 UTC | Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into maint-1.6.0 * jc/maint-1.6.0-split-diff-metainfo: diff.c: output correct index lines for a split diff | 13 March 2009, 03:01:28 UTC |
| eb006cc | Danijel Tasov | 28 February 2009, 20:03:54 UTC | added missing backtick in git-apply.txt Signed-off-by: Danijel Tasov <dt@korn.shell.la> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2009, 21:10:16 UTC |
| cce074a | Christian Couder | 27 February 2009, 06:31:22 UTC | bisect: fix another instance of eval'ed string When there is nothing to be skipped, the output from rev-list --bisect-vars was eval'ed without first being strung together with &&; this is probably not a problem as it is much less likely to be a bad input than the list handcrafted by the filter_skip function, but it still is a good discipline. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2009, 22:30:34 UTC |
| 1b249ff | Christian Couder | 27 February 2009, 06:31:22 UTC | bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped When the "bad" commit was also "skip"ped and when more than one commit was skipped, the "filter_skipped" function would have printed something like: bisect_rev=<hash1>|<hash2> (where <hash1> and <hash2> are hexadecimal sha1 hashes) and this would have been evaled later as piping "bisect_rev=<hash1>" into "<hash2>", which would have failed. So this patch makes the "filter_skipped" function properly quote what it outputs, so that it will print something like: bisect_rev='<hash1>|<hash2>' which will be properly evaled later. The caller was not stopping properly because the scriptlet this function returned to be evaled was not strung together with && and because of this, an error in an earlier part of the output was simply ignored. A test case is added to the test suite. And while at it, we also initialize the VARS, FOUND and TRIED variables, so that we protect ourselves from environment variables the user may have with these names. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2009, 08:57:28 UTC |
| dd482ee | Finn Arne Gangstad | 10 February 2009, 14:20:17 UTC | Support "\" in non-wildcard exclusion entries "\" was treated differently in exclude rules depending on whether a wildcard match was done. For wildcard rules, "\" was de-escaped in fnmatch, but this was not done for other rules since they used strcmp instead. A file named "#foo" would not be excluded by "\#foo", but would be excluded by "\#foo*". We now treat all rules with "\" as wildcard rules. Another solution could be to de-escape all non-wildcard rules as we read them, but we would have to do the de-escaping exactly as fnmatch does it to avoid inconsistencies. Signed-off-by: Finn Arne Gangstad <finnag@pvv.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2009, 19:36:43 UTC |
| 3e6b1d0 | Junio C Hamano | 10 February 2009, 20:16:31 UTC | Make repack less likely to corrupt repository Some platforms refuse to rename a file that is open. When repacking an already packed repository without adding any new object, the resulting pack will contain the same set of objects as an existing pack, and on such platforms, a newly created packfile cannot replace the existing one. The logic detected this issue but did not try hard enough to recover from it. Especially because the files that needs renaming come in pairs, there potentially are different failure modes that one can be renamed but the others cannot. Asking manual recovery to end users were error prone. This patch tries to make it more robust by first making sure all the existing files that need to be renamed have been renamed before continuing, and attempts to roll back if some failed to rename. This is based on an initial patch by Robin Rosenberg. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2009, 02:32:16 UTC |
| 784f8af | Elijah Newren | 11 February 2009, 06:03:53 UTC | fast-export: ensure we traverse commits in topological order fast-export will only list as parents those commits which have already been traversed (making it appear as if merges have been squashed if not all parents have been traversed). To avoid this silent squashing of merge commits, we request commits in topological order. Signed-off-by: Elijah Newren <newren@gmail.com> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2009, 02:30:17 UTC |
| fa3a0c9 | Shawn O. Pearce | 11 February 2009, 18:15:30 UTC | Clear the delta base cache if a pack is rebuilt There is some risk that re-opening a regenerated pack file with different offsets could leave stale entries within the delta base cache that could be matched up against other objects using the same "struct packed_git*" and pack offset. Throwing away the entire delta base cache in this case is safer, as we don't have to worry about a recycled "struct packed_git*" matching to the wrong base object, resulting in delta apply errors while unpacking an object. Suggested-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2009, 18:25:24 UTC |
| 3d20c63 | Shawn O. Pearce | 10 February 2009, 21:36:12 UTC | Clear the delta base cache during fast-import checkpoint Otherwise we may reuse the same memory address for a totally different "struct packed_git", and a previously cached object from the prior occupant might be returned when trying to unpack an object from the new pack. Found-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2009, 23:30:59 UTC |
| ab2fdb3 | David J. Mellor | 05 February 2009, 04:14:29 UTC | Fixed broken git help -w when installing from RPM After the git-core package was renamed to git, git help -w was still looking for files in /usr/share/doc/git-core-$VERSION instead of /usr/share/doc/git-$VERSION. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2009, 06:00:49 UTC |
| 5aed3c6 | Matthieu Moy | 04 February 2009, 09:32:08 UTC | builtin-mv.c: check for unversionned files before looking at the destination. The previous code was failing in the case where one moves an unversionned file to an existing destination, with mv -f: the "existing destination" was checked first, and the error was cancelled by the force flag. We now check the unrecoverable error first, which fixes the bug. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 19:07:42 UTC |
| c8ba6b1 | Matthieu Moy | 04 February 2009, 09:32:07 UTC | Add a testcase for "git mv -f" on untracked files. This currently fails with: git: builtin-mv.c:217: cmd_mv: Assertion `pos >= 0' failed. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 19:04:56 UTC |
| 720ec6b | Matthieu Moy | 04 February 2009, 09:32:06 UTC | Missing && in t/t7001.sh. Without this, the exit status is only the one of the last line. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 19:04:44 UTC |
| 7a85f6a | William Pursell | 03 February 2009, 22:41:14 UTC | User-manual: "git stash <comment>" form is long gone These days you must explicitly say "git stash save <comment>". Signed-off-by: William Pursell <bill.pursell@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 06:13:47 UTC |
| 37fc57a | Guanqun Lu | 04 February 2009, 21:00:41 UTC | add test-dump-cache-tree in Makefile 5c5ba73 (Makefile: Use generic rule to build test programs, 2007-05-31) tried to use generic rule to build test programs, but it misses the file 'dump-cache-tree.c', since its name is not prefixed by 'test-'. This commit solves this little problem by renaming this file instead of carrying out an explicit rule in Makefile. Signed-off-by: Guanqun Lu <guanqun.lu@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 06:11:44 UTC |
| c9a8abc | Guanqun Lu | 04 February 2009, 21:00:40 UTC | fix typo in Documentation Signed-off-by: Guanqun Lu <guanqun.lu@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 06:09:03 UTC |
| e1e4389 | Johannes Schindelin | 04 February 2009, 01:50:15 UTC | apply: fix access to an uninitialized mode variable, found by valgrind When 'tpatch' was initialized successfully, st_mode was already taken from the previous diff. We should not try to override it with data from an lstat() that was never called. This is a companion patch to 7a07841(git-apply: handle a patch that touches the same path more than once better). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 06:04:31 UTC |
| bc39564 | Junio C Hamano | 02 February 2009, 18:58:20 UTC | grep: pass -I (ignore binary) down to external grep We forgot to pass this option to the external grep process. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 February 2009, 18:58:20 UTC |
| c7cddc1 | René Scharfe | 31 January 2009, 14:39:10 UTC | merge: fix out-of-bounds memory access The parameter n of unpack_callback() can have a value of up to MAX_UNPACK_TREES. The check at the top of unpack_trees() (its only (indirect) caller) makes sure it cannot exceed this limit. unpack_callback() passes it and the array src to unpack_nondirectories(), which has this loop: for (i = 0; i < n; i++) { /* ... */ src[i + o->merge] = o->df_conflict_entry; o->merge can be 0 or 1, so unpack_nondirectories() potentially accesses the array src at index MAX_UNPACK_TREES. This patch makes it big enough. Reported-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2009, 18:39:55 UTC |
| 915308b | Jeff King | 29 January 2009, 05:56:34 UTC | avoid 31-bit truncation in write_loose_object The size of the content we are adding may be larger than 2.1G (i.e., "git add gigantic-file"). Most of the code-path to do so uses size_t or unsigned long to record the size, but write_loose_object uses a signed int. On platforms where "int" is 32-bits (which includes x86_64 Linux platforms), we end up passing malloc a negative size. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 January 2009, 07:40:53 UTC |
| c32815f | Kirill Smelkov | 12 January 2009, 22:21:04 UTC | mailinfo: tests for RFC2047 examples Also as suggested by Junio, in order to try to catch other MIME problems, test cases from the "8. Examples" section of RFC2047 are added to t5100 testsuite as well. Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru> | 29 January 2009, 00:23:21 UTC |
| 806d5e9 | Kirill Smelkov | 13 January 2009, 09:33:48 UTC | mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)' Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru> | 28 January 2009, 23:12:24 UTC |
| b8469ad | Johannes Schindelin | 27 January 2009, 23:07:36 UTC | test-path-utils: Fix off by one, found by valgrind When normalizing an absolute path, we might have to add a slash _and_ a NUL to the buffer, so the buffer was one too small. Let's just future proof the code and alloc PATH_MAX + 1 bytes. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2009, 23:16:41 UTC |
| f265458 | Johannes Schindelin | 27 January 2009, 23:07:46 UTC | get_sha1_basic(): fix invalid memory access, found by valgrind When get_sha1_basic() is passed a buffer of len 0, it should not check if buf[len-1] is a curly bracket. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2009, 23:16:31 UTC |
| b67b961 | Junio C Hamano | 26 January 2009, 08:08:24 UTC | diff.c: output correct index lines for a split diff A patch that changes the filetype (e.g. regular file to symlink) of a path must be split into a deletion event followed by a creation event, which means that we need to have two independent metainfo lines for each. However, the code reused the single set of metainfo lines. As the blob object names recorded on the index lines are usually not used nor validated on the receiving end, this is not an issue with normal use of the resulting patch. However, when accepting a binary patch to delete a blob, git-apply verified that the postimage blob object name on the index line is 0{40}, hence a patch that deletes a regular file blob that records binary contents to create a blob with different filetype (e.g. a symbolic link) failed to apply. "git am -3" also uses the blob object names recorded on the index line, so it would also misbehave when synthesizing a preimage tree. This moves the code to generate metainfo lines around, so that two independent sets of metainfo lines are used for the split halves. Additional tests by Jeff King. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2009, 08:48:00 UTC |
| b938f62 | Boyd Stephen Smith Jr | 22 January 2009, 18:26:25 UTC | Fix Documentation for git-describe The documentation for git-describe says the default abbreviation is 8 hexadecimal digits while cache.c clearly shows DEFAULT_ABBREV set to 7. This patch corrects the documentation. Signed-off-by: Boyd Stephen Smith Jr <bss@iguanasuicide.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 January 2009, 08:17:04 UTC |
| 3aed2fd | Christian Couder | 18 January 2009, 03:46:09 UTC | builtin-fsck: fix off by one head count According to the man page, if "git fsck" is passed one or more heads, it should verify connectivity and validity of only objects reachable from the heads it is passed. However, since 5ac0a20 (Make builtin-fsck.c use parse_options., 2007-10-15) the command behaved as if no heads were passed, when given only one argument. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 06:37:41 UTC |
| bf474e2 | Markus Heidelberg | 16 January 2009, 21:42:33 UTC | Documentation: let asciidoc align related options Command line options can share the same paragraph of description, if they are related or synonymous. In these cases they should be written among each other, so that asciidoc can format them itself. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 02:01:46 UTC |
| 9968696 | Stephan Beyer | 16 January 2009, 20:36:06 UTC | githooks.txt: add missing word Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 01:57:41 UTC |
| 2454ac7 | Stephan Beyer | 16 January 2009, 19:40:05 UTC | builtin-commit.c: do not remove COMMIT_EDITMSG git-commit tries to remove the file ./COMMIT_EDITMSG instead of $GIT_DIR/COMMIT_EDITMSG after commit preparation (e.g. running hooks, launching editor). This behavior exists since f5bbc3225c4b07 "Port git commit to C". Some test cases (e.g. t/t7502-commit.sh) rely on the existence of $GIT_DIR/COMMIT_EDITMSG after committing and, I guess, many people are used to it. So it is best not to remove it. This patch just removes the removal of COMMIT_EDITMSG. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 01:57:35 UTC |
| f8aa1b6 | Stephan Beyer | 15 January 2009, 12:56:16 UTC | t3404: Add test case for auto-amending only edited commits after "edit" Add a test case for the bugfix introduced by commit c14c3c82d "git-rebase--interactive: auto amend only edited commit". Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2009, 22:22:53 UTC |
| dc7f55c | Stephan Beyer | 15 January 2009, 12:56:15 UTC | t3404: Add test case for aborted --continue after "edit" Add a test case for the bugfix introduced by commit 8beb1f33d "git-rebase-interactive: do not squash commits on abort". Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2009, 22:22:42 UTC |
| 944019c | Stephan Beyer | 15 January 2009, 13:03:17 UTC | t3501: check that commits are actually done The basic idea of t3501 is to check whether revert and cherry-pick works on renamed files. But as there is no pure cherry-pick/revert test, it is good to also check if commits are actually done in that scenario. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2009, 22:22:12 UTC |
| be17262 | Michael J Gruber | 14 January 2009, 17:03:22 UTC | fix handling of multiple untracked files for git mv -k The "-k" option to "git mv" should allow specifying multiple untracked files. Currently, multiple untracked files raise an assertion if they appear consecutively as arguments. Fix this by decrementing the loop index after removing one entry from the array of arguments. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2009, 17:34:22 UTC |
| 3772923 | Michael J Gruber | 14 January 2009, 17:03:21 UTC | add test cases for "git mv -k" Add test cases for ignoring nonexisting and untracked files using the -k option to "git mv". There is one known breakage related to multiple untracked files specfied as consecutive arguments. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2009, 17:29:24 UTC |
| 3d1d81e | Felipe Contreras | 14 January 2009, 01:37:07 UTC | fast-import: Cleanup mode setting. "S_IFREG | mode" makes only sense for 0644 and 0755. Even though doing (S_IFREG | mode) may not hurt when mode is any other supported value, that is only true because S_IFREG mode bit happens to be already on for S_IFLNK or S_IFGITLINK. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2009, 06:57:12 UTC |
| 8faea4f | Jay Soffian | 13 January 2009, 22:41:35 UTC | Git.pm: call Error::Simple() properly The error message to Error::Simple() must be passed as a single argument. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2009, 06:52:35 UTC |
| 12dd111 | Pierre Habouzit | 12 January 2009, 23:09:36 UTC | Avoid spurious error messages on error mistakes. Prior to that, if the user chose "squash" as a first action, the stderr looked like: grep: /home/madcoder/dev/scm/git/.git/rebase-merge/done: No such file or directory Cannot 'squash' without a previous commit Now the first line is gone. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2009, 08:21:31 UTC |
| 47a845b | jidanni@jidanni.org | 13 January 2009, 01:19:42 UTC | contrib/examples/README: give an explanation of the status of these files We attempt to give an explanation of the status of the files in this directory. Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2009, 01:47:36 UTC |
| ddfb369 | Kirill Smelkov | 12 January 2009, 23:22:11 UTC | mailinfo: 'From:' header should be unfold as well At present we do headers unfolding (see RFC822 3.1.1. LONG HEADER FIELDS) for all fields except 'From' (always) and 'Subject' (when keep_subject is set) Not unfolding 'From' is a bug -- see above-mentioned RFC link. Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2009, 23:22:11 UTC |
| 353aaf2 | Kirill Smelkov | 07 January 2009, 22:43:42 UTC | mailinfo: correctly handle multiline 'Subject:' header When native language (RU) is in use, subject header usually contains several parts, e.g. Subject: [Navy-patches] [PATCH] =?utf-8?b?0JjQt9C80LXQvdGR0L0g0YHQv9C40YHQvtC6INC/0LA=?= =?utf-8?b?0LrQtdGC0L7QsiDQvdC10L7QsdGF0L7QtNC40LzRi9GFINC00LvRjyA=?= =?utf-8?b?0YHQsdC+0YDQutC4?= This exposes several bugs in builtin-mailinfo.c: 1. decode_b_segment: do not append explicit NUL -- explicit NUL was preventing correct header construction on parts concatenation via strbuf_addbuf in decode_header_bq. Fixes: -Subject: Изменён список пакетов необходимых для сборки +Subject: Изменён список па Then 2. Do not emit '\n' between "encoded-word" where RFC2046 says that linear white space between them are ignored when displaying. Fixes: -Subject: Изменён список пакетов необходимых для сборки +Subject: Изменён список па кетов необходимых для сборки Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 January 2009, 01:54:30 UTC |
| 141201d | Junio C Hamano | 07 January 2009, 06:12:30 UTC | Merge branch 'maint-1.5.6' into maint-1.6.0 * maint-1.5.6: README: tutorial.txt is now called gittutorial.txt | 07 January 2009, 06:12:30 UTC |
| 8a124b8 | Joey Hess | 07 January 2009, 04:23:37 UTC | README: tutorial.txt is now called gittutorial.txt Signed-off-by: Joey Hess <joey@gnu.kitenet.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2009, 06:12:07 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 |
| 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 |
| 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 |
| 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 |
| 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 |
| 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 |
| c74faea | Nicolas Pitre | 09 December 2008, 19:26:52 UTC | make sure packs to be replaced are closed beforehand Especially on Windows where an opened file cannot be replaced, make sure pack-objects always close packs it is about to replace. Even on non Windows systems, this could save potential bad results if ever objects were to be read from the new pack file using offset from the old index. This should fix t5303 on Windows. Signed-off-by: Nicolas Pitre <nico@cam.org> Tested-by: Johannes Sixt <j6t@kdbg.org> (MinGW) Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2008, 01:56:05 UTC |
| aa971cb | Junio C Hamano | 08 December 2008, 02:38:46 UTC | work around Python warnings from AsciiDoc It appears that a reference to an anchor defined as [[anchor-name]] from another place using <<anchor-name>> syntax, when the anchor name contains a string "-with-" in its name, triggers these warnings from Python interpreter. asciidoc -b docbook -d book user-manual.txt <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6 <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6 <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6 <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6 There currently is no reference to "Finding comments with given content", but for consistency and for futureproofing, the anchor is also updated as the other ones that are actually used and trigger these warnings. Signed-off-by: Junio C Hamano <junio@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2008, 03:06:15 UTC |
| 553589f | Deskin Miller | 08 December 2008, 13:31:31 UTC | git-svn: Make following parents atomic find_parent_branch generates branch@rev type branches when one has to look back through SVN history to properly get the history for a branch copied from somewhere not already being tracked by git-svn. If in the process of fetching this history, git-svn is interrupted, then when one fetches again, it will use whatever was last fetched as the parent commit and fail to fetch any more history which it didn't get to before being terminated. This is especially troubling in that different git-svn copies of the same SVN repository can end up with different commit sha1s, incorrectly showing the history as divergent and precluding easy collaboration using git push and fetch. To fix this, when we initialise the Git::SVN object $gs to search for and perhaps fetch history, we check if there are any commits in SVN in the range between the current revision $gs is at, and the top revision for which we were asked to fill history. If there are commits we're missing in that range, we continue the fetch from the current revision to the top, properly getting all history before using it as the parent for the branch we're trying to create. Signed-off-by: Deskin Miller <deskinm@umich.edu> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2008, 00:29:34 UTC |
| 1c2ed59 | Junio C Hamano | 07 December 2008, 11:03:16 UTC | GIT 1.6.0.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2008, 23:11:54 UTC |
| dbc2fb6 | Matt McCutchen | 11 October 2008, 01:56:15 UTC | "git diff <tree>{3,}": do not reverse order of arguments According to the message of commit 0fe7c1de16f71312e6adac4b85bddf0d62a47168, "git diff" with three or more trees expects the merged tree first followed by the parents, in order. However, this command reversed the order of its arguments, resulting in confusing diffs. A comment /* Again, the revs are all reverse */ suggested there was a reason for this, but I can't figure out the reason, so I removed the reversal of the arguments. Test case included. Signed-off-by: Matt McCutchen <matt@mattmccutchen.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 07 December 2008, 22:57:57 UTC |
| 3927bbe | Jeff King | 06 December 2008, 19:40:34 UTC | tag: delete TAG_EDITMSG only on successful tag The user may put some effort into writing an annotated tag message. When the tagging process later fails (which can happen fairly easily, since it may be dependent on gpg being correctly configured and used), there is no record left on disk of the tag message. Instead, let's keep the TAG_EDITMSG file around until we are sure the tag has been created successfully. If we die because of an error, the user can recover their text from that file. Leaving the file in place causes no conflicts; it will be silently overwritten by the next annotated tag creation. This matches the behavior of COMMIT_EDITMSG, which stays around in case of error. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2008, 10:53:45 UTC |
| bcc6a83 | Jakub Narebski | 07 December 2008, 09:36:36 UTC | gitweb: Make project specific override for 'grep' feature work The 'grep' feature was marked in the comments as having project specific config, but it lacked 'sub' key required for it to work. Kind-of-Noticed-by: Matt Kraai <kraai@ftbfs.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2008, 10:52:37 UTC |
| e4a80ec | Miklos Vajna | 07 December 2008, 00:45:37 UTC | http.c: use 'git_config_string' to get 'curl_http_proxy' Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2008, 10:41:55 UTC |
| d551bba | Thomas Rast | 06 December 2008, 20:50:09 UTC | fetch-pack: Avoid memcpy() with src==dst memcpy() may only be used for disjoint memory areas, but when invoked from cmd_fetch_pack(), we have my_args == &args. (The argument cannot be removed entirely because transport.c invokes with its own variable.) Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2008, 10:41:45 UTC |
| 2ab4de5 | Junio C Hamano | 03 December 2008, 07:47:25 UTC | Merge branch 'jk/maint-commit-v-strip' into maint * jk/maint-commit-v-strip: commit: Fix stripping of patch in verbose mode. | 03 December 2008, 07:47:25 UTC |
| 733070b | Davide Libenzi | 08 November 2008, 05:24:33 UTC | xdiff: give up scanning similar lines early In a corner case of large files whose lines do not match uniquely, the loop to eliminate a line that matches multiple locations adjacent to a run of lines that do not uniquely match wasted too much cycles. Fix this by giving up early after scanning 100 lines in both direction. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2008, 07:45:37 UTC |
| 0fd9d7e | Junio C Hamano | 03 December 2008, 07:00:04 UTC | Merge branch 'bc/maint-keep-pack' into maint * bc/maint-keep-pack: repack: only unpack-unreachable if we are deleting redundant packs t7700: test that 'repack -a' packs alternate packed objects pack-objects: extend --local to mean ignore non-local loose objects too sha1_file.c: split has_loose_object() into local and non-local counterparts t7700: demonstrate mishandling of loose objects in an alternate ODB builtin-gc.c: use new pack_keep bitfield to detect .keep file existence repack: do not fall back to incremental repacking with [-a|-A] repack: don't repack local objects in packs with .keep file pack-objects: new option --honor-pack-keep packed_git: convert pack_local flag into a bitfield and add pack_keep t7700: demonstrate mishandling of objects in packs with a .keep file | 03 December 2008, 07:00:04 UTC |
| e23f682 | Junio C Hamano | 03 December 2008, 06:38:07 UTC | Merge branch 'js/mingw-rename-fix' into maint * js/mingw-rename-fix: compat/mingw.c: Teach mingw_rename() to replace read-only files | 03 December 2008, 06:38:07 UTC |
| 25e30fa | Miklos Vajna | 01 December 2008, 18:50:02 UTC | User's Manual: remove duplicated url at the end of Appendix B Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2008, 23:17:07 UTC |
| 5359fde | Junio C Hamano | 01 December 2008, 02:33:20 UTC | Update draft release notes to 1.6.0.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2008, 02:33:20 UTC |
| 27f6496 | Junio C Hamano | 01 December 2008, 02:18:50 UTC | Merge branch 'st/maint-tag' into maint * st/maint-tag: tag: Add more tests about mixing incompatible modes and options tag: Check that options are only allowed in the appropriate mode | 01 December 2008, 02:18:50 UTC |
| 270c354 | Junio C Hamano | 01 December 2008, 02:18:11 UTC | Merge branch 'mk/maint-cg-push' into maint * mk/maint-cg-push: git push: Interpret $GIT_DIR/branches in a Cogito compatible way | 01 December 2008, 02:18:11 UTC |
| 16d2583 | Nguyễn Thái Ngọc Duy | 30 November 2008, 10:54:31 UTC | generate-cmdlist.sh: avoid selecting synopsis at wrong place In "common" man pages there is luckily no "NAME" anywhere except at beginning of documents. If there is another "NAME", sed could mis-select it and lead to common-cmds.h corruption. So better nail it at beginning of line, which would reduce corruption chance. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2008, 02:16:32 UTC |
| 539eec4 | Junio C Hamano | 28 November 2008, 03:23:27 UTC | Merge branch 'mv/fast-export' into maint * mv/fast-export: fast-export: use an unsorted string list for extra_refs Add new testcase to show fast-export does not always exports all tags | 28 November 2008, 03:23:27 UTC |
| 3524357 | Sam Vilain | 14 November 2008, 07:19:34 UTC | sha1_file.c: resolve confusion EACCES vs EPERM An earlier commit 916d081 (Nicer error messages in case saving an object to db goes wrong, 2006-11-09) confused EACCES with EPERM, the latter of which is an unlikely error from mkstemp(). Signed-off-by: Sam Vilain <sam@vilain.net> | 28 November 2008, 03:11:21 UTC |
| 65117ab | Joey Hess | 20 November 2008, 18:56:28 UTC | sha1_file: avoid bogus "file exists" error message This avoids the following misleading error message: error: unable to create temporary sha1 filename ./objects/15: File exists mkstemp can fail for many reasons, one of which, ENOENT, can occur if the directory for the temp file doesn't exist. create_tmpfile tried to handle this case by always trying to mkdir the directory, even if it already existed. This caused errno to be clobbered, so one cannot tell why mkstemp really failed, and it truncated the buffer to just the directory name, resulting in the strange error message shown above. Note that in both occasions that I've seen this failure, it has not been due to a missing directory, or bad permissions, but some other, unknown mkstemp failure mode that did not occur when I ran git again. This code could perhaps be made more robust by retrying mkstemp, in case it was a transient failure. Signed-off-by: Joey Hess <joey@kitenet.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2008, 02:48:53 UTC |
| 1510dbe | Matt McCutchen | 24 November 2008, 06:55:22 UTC | git checkout: don't warn about unborn branch if -f is already passed I think it's unnecessary to warn that the checkout has been forced due to an unborn current branch if -f has been explicitly passed. For one project, I am using git-new-workdir to create workdirs from a bare repository whose HEAD is set to an unborn branch, and this warning started to irritate me. Signed-off-by: Matt McCutchen <matt@mattmccutchen.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2008, 02:35:28 UTC |
| c078383 | SZEDER Gábor | 27 November 2008, 13:35:53 UTC | bash: offer refs instead of filenames for 'git revert' The completion script for 'git revert' currently offers options and filenames. However, 'git revert' doesn't take any filenames from the command line, but a single commit. Therefore, it's more sane to offer refs instead. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2008, 02:35:07 UTC |
| 8d8163f | SZEDER Gábor | 27 November 2008, 13:35:38 UTC | bash: remove dashed command leftovers Commit 5a625b07 (bash: remove fetch, push, pull dashed form leftovers, 2008-10-03) did that already, but there were still some git-cmd left here and there. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2008, 02:29:53 UTC |
| b21a226 | Junio C Hamano | 27 November 2008, 21:18:25 UTC | Merge branch 'pw/maint-p4' into maint * pw/maint-p4: git-p4: fix keyword-expansion regex | 27 November 2008, 21:18:25 UTC |
| 3d51c85 | Pete Wyckoff | 26 November 2008, 18:52:15 UTC | git-p4: fix keyword-expansion regex This text: my $dir = $File::Find::dir; return if ($dir !~ m,$options->{dirpat}$,); was improperly converted to: my $dir = $File$dir !~ m,$options->{dirpat}$,); by the keyword identifier expansion code. Add a \n to make sure the regex doesn't go across end-of-line boundaries. Signed-off-by: Pete Wyckoff <pw@padd.com> Acked-by: Simon Hausmann <simon@lst.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2008, 21:17:58 UTC |
| a0178ae | Ralf Wildenhues | 27 November 2008, 07:32:01 UTC | Fix typos in the documentation. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2008, 09:00:45 UTC |
| 5aa3bdd | Junio C Hamano | 26 November 2008, 19:57:15 UTC | Merge branch 'mm/maint-sort-config-doc' into maint * mm/maint-sort-config-doc: config.txt: alphabetize configuration sections | 26 November 2008, 19:57:15 UTC |
| b0f34c3 | Matt McCutchen | 26 November 2008, 08:26:50 UTC | config.txt: alphabetize configuration sections I figured the sections might as well be in some order, so I chose alphabetical but with "core" at the beginning. This should help people add new variables in the right places. Signed-off-by: Matt McCutchen <matt@mattmccutchen.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 November 2008, 19:07:57 UTC |
| 61af494 | Junio C Hamano | 26 November 2008, 17:58:41 UTC | Teach "git diff" to honour --[no-]ext-diff The original intention of 72909be (Add diff-option --ext-diff, 2007-06-30) was to optionally allow the use of external diff viewer in "git log" family (while keeping them disabled by default). It exposed the "allow external diff" bit to the UI, but forgot to adjust the "git diff" codepath that was set up to always allow use of the external diff viewer. Noticed by Nazri Ramliy; tests by René Scharfe squashed in. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 November 2008, 17:58:41 UTC |
| 2075ffb | Johannes Schindelin | 23 November 2008, 11:55:54 UTC | fast-export: use an unsorted string list for extra_refs The list extra_refs contains tags and the objects referenced by them, so that they can be handled at the end. When a tag references a commit, that commit is added to the list using the same name. Also, the function handle_tags_and_duplicates() relies on the order the items were added to extra_refs, so clearly we do not want to use a sorted list here. Noticed by Miklos Vajna. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Tested-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 November 2008, 03:54:51 UTC |
| 283b953 | Miklos Vajna | 22 November 2008, 18:22:48 UTC | Add new testcase to show fast-export does not always exports all tags Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 November 2008, 03:54:24 UTC |
| 37a7744 | Bryan Drewery | 20 November 2008, 05:11:42 UTC | Fix misleading wording for git-cherry-pick Documentation for -n implies that -x is normally used, however this is no longer true. Signed-off-by: Bryan Drewery <bryan@shatow.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 November 2008, 03:32:39 UTC |
| 632f701 | Johannes Sixt | 19 November 2008, 16:25:27 UTC | compat/mingw.c: Teach mingw_rename() to replace read-only files On POSIX, rename() can replace files that are not writable. On Windows, however, read-only files cannot be replaced without additional efforts: We have to make the destination writable first. Since the situations where the destination is read-only are rare, we do not make the destination writable on every invocation, but only if the first try to rename a file failed with an "access denied" error. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 November 2008, 03:26:42 UTC |
