Skip to main content

Browse the archive

Staging
v0.5.1
swh:1:snp:c5feb7ee9221a3820c8879e85e8a18470c0b3afa
sort by:
Revision Author Date Message Commit Date
c3c1352 Junio C Hamano 02 February 2008, 03:10:10 UTC GIT 1.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 February 2008, 03:10:10 UTC
7dc4642 Junio C Hamano 02 February 2008, 03:06:56 UTC Fix "git checkout -b foo ':/substring'" Because ':/substring' extended SHA1 expression cannot take postfix modifiers such as ^{tree} and ^{commit}, we would need to do it in multiple steps. With the patch, you can start a new branch from a randomly-picked commit whose message has the named string in it. Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 February 2008, 03:08:14 UTC
0509eb2 Michele Ballabio 31 January 2008, 21:59:11 UTC Fix typo in a comment in t/test-lib.sh Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 31 January 2008, 22:43:54 UTC
da101b8 Miklos Vajna 31 January 2008, 19:55:57 UTC git rev-parse manpage: spelling fix Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 31 January 2008, 21:59:00 UTC
bb8eebb Junio C Hamano 31 January 2008, 21:51:42 UTC Revert "filter-branch docs: remove brackets so not to imply revision arg is optional" This reverts commit c41b439244c51b30c60953192816afc91e552578, as we decided to default to HEAD when revision parameters are missing and they are no longer mandatory. 31 January 2008, 21:51:42 UTC
c02792e Jean-Luc Herren 31 January 2008, 02:06:04 UTC Documentation/git-cvsserver: Fix typo Signed-off-by: Jean-Luc Herren <jlh@gmx.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> 31 January 2008, 02:50:41 UTC
0f047f3 Brandon Casey 30 January 2008, 19:33:04 UTC filter-branch: assume HEAD if no revision supplied filter-branch previously took the first non-option argument as the name for a new branch. Since dfd05e38, it now takes a revision or a revision range and modifies the current branch. Update to operate on HEAD by default to conform with standard git interface practice. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> 31 January 2008, 02:50:25 UTC
c41b439 Brandon Casey 31 January 2008, 00:41:25 UTC filter-branch docs: remove brackets so not to imply revision arg is optional Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> 31 January 2008, 01:21:02 UTC
733f181 Shawn O. Pearce 30 January 2008, 06:21:56 UTC Use 'printf %s $x' notation in t5401 We only care about getting what should be an empty string and sending it to a file, without a trailing LF, so the empty string translates into a 0 byte file. Earlier when I originally wrote these lines Mac OS X allowed the format string of printf to be the empty string, but more recent versions appear to have been 'improved' with error messages if the format is not given. This may cause problems if we ever wind up with changes to the hook tests. A minor cleanup makes the test more safe on all systems, by conforming to accepted printf conventions. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 31 January 2008, 01:17:39 UTC
def16e7 Brandon Casey 28 January 2008, 21:16:02 UTC filter-branch.sh: remove temporary directory on failure One of the first things filter-branch does is to create a temporary directory. This directory is eventually removed by the script during normal operation, but is not removed if the script encounters an error. Set a trap to remove it when the script terminates for any reason. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 January 2008, 19:56:12 UTC
0eab8ca Brandon Casey 29 January 2008, 22:41:30 UTC git-relink: avoid hard linking in objects/info directory git-relink is intended to search for packs and loose objects in common between two repositories and to replace the one set with hard links to the other. Files other than packs and loose objects should not be touched, so add the "info" sub-directory to the pattern of directory excludes. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 January 2008, 08:01:27 UTC
c1dcf7e Bruno Ribas 30 January 2008, 05:37:56 UTC gitweb: Make use of the $git_dir variable at sub git_get_project_description Signed-off-by: Bruno Ribas <ribas@c3sl.ufpr.br> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 January 2008, 07:55:18 UTC
d661146 Jakub Narebski 29 January 2008, 19:52:32 UTC gitweb: Add info about $projectroot and $projects_list to gitweb/README Those two configuration variables are important enough that it is worth to explicitely write about them in the "Gitweb config file variables" section even if they are usually set during build by GITWEB_PROJECTROOT and GITWEB_LIST build (Makefile) configuration variables. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 January 2008, 06:01:20 UTC
a5d86f7 Jim Meyering 29 January 2008, 19:38:55 UTC fix doc typos Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 January 2008, 06:00:34 UTC
bda3a31 Junio C Hamano 26 January 2008, 07:53:05 UTC reflog-expire: Avoid creating new files in a directory inside readdir(3) loop "git reflog expire --all" opened a directory in $GIT_DIR/logs/, read reflog files in there readdir(3), and rewrote the file by creating a new file and renaming it back inside the loop. This code structure can cause the newly created file to be returned by subsequent call to readdir(3), and fall into an infinite loop in the worst case. This separates the processing to two phase. Running for_each_reflog() to find out and collect all refs, and then iterate over them, calling expire_reflog(). This way, the program would behave exactly the same way as if all the refs were given by the user from the command line. Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 January 2008, 05:48:57 UTC
7720224 Yasushi SHOJI 29 January 2008, 12:16:02 UTC gitweb: Convert generated contents to utf8 in commitdiff_plain If the commit message, or commit author contains non-ascii, it must be converted from Perl internal representation to utf-8, to follow what got declared in HTTP header. Use to_utf8() to do the conversion. This necessarily replaces here-doc with "print" statements. Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com> Acked-by: İsmail Dönmez <ismail@pardus.org.tr> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 January 2008, 05:23:57 UTC
ab989ad Christian Couder 29 January 2008, 06:08:44 UTC instaweb: use 'browser.<tool>.path' config option if it's set. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 January 2008, 08:49:28 UTC
f7ff09d Christian Couder 29 January 2008, 06:08:29 UTC Documentation: help: specify supported html browsers. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 January 2008, 08:49:27 UTC
584627b Christian Couder 29 January 2008, 06:08:22 UTC Documentation: config: add "browser.<tool>.path". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 January 2008, 08:49:23 UTC
752527f Johannes Schindelin 28 January 2008, 16:33:28 UTC Add test for rebase -i with commits that do not pass pre-commit This accompanies c5b09feb786f6a2456ec3d8203d0f4d67f09f043 (Avoid update hook during git-rebase --interactive) to make sure that any regression to make Debian's Bug#458782 (git-core: git-rebase doesn't work when trying to squash changes into commits created with --no-verify) resurface will be caught. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 January 2008, 19:04:00 UTC
c0d4528 Jeff King 22 January 2008, 03:23:53 UTC t9001: add missing && operators The exit value of some commands was not being used for the test output. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 January 2008, 19:02:59 UTC
bf5aeb1 Junio C Hamano 27 January 2008, 02:39:41 UTC GIT 1.5.4-rc5 Hopefully the last rc before the final... Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 January 2008, 06:48:03 UTC
c85c792 Johannes Schindelin 26 January 2008, 18:04:37 UTC pull --rebase: be cleverer with rebased upstream branches When the upstream branch is tracked, we can detect if that branch was rebased since it was last fetched. Teach git to use that information to rebase from the old remote head onto the new remote head. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 January 2008, 02:24:24 UTC
e509db9 Steffen Prohaska 26 January 2008, 09:54:06 UTC cvsserver: Fix for histories with multiple roots Git histories may have multiple roots, which can cause git merge-base to fail and this caused git cvsserver to die. This commit teaches git cvsserver to handle a failing git merge-base gracefully, and modifies the test case to verify this. All the test cases now use a history with two roots. Signed-off-by: Steffen Prohaska <prohaska@zib.de> git-cvsserver.perl | 9 ++++++++- t/t9400-git-cvsserver-server.sh | 10 +++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 January 2008, 01:58:18 UTC
7549376 Steffen Prohaska 26 January 2008, 09:54:05 UTC t9400-git-cvsserver-server: Wrap setup into test case It is preferable to have the test setup in a test case. The setup itself may fail and having it as a test case handles this situation more gracefully. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 January 2008, 01:44:05 UTC
ab8daa1 Mike Hommey 26 January 2008, 11:04:30 UTC Documentation: add a bit about sendemail.to configuration While there is information about this in the configuration section, it was missing in the options section. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 January 2008, 18:59:07 UTC
3a9f0f4 Pierre Habouzit 26 January 2008, 11:26:57 UTC parse-options: catch likely typo in presense of aggregated options. If options are aggregated, and that the whole token is an exact prefix of a long option that is longer than 2 letters, reject it. This is to prevent a common typo: $ git commit -amend to get interpreted as "commit all with message 'end'". The typo check isn't performed if there is no aggregation, because the stuck form is the recommended one. If we have `-o` being a valid short option that takes an argument, and --option a long one, then we _MUST_ accept -option as "'o' option with argument 'ption'", which is our official recommended form. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 January 2008, 18:53:31 UTC
923e3ec Mike Hommey 26 January 2008, 12:19:02 UTC Add a missing dependency on http.h Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 January 2008, 18:52:40 UTC
10eb64f Miklos Vajna 25 January 2008, 10:17:38 UTC git pull manpage: don't include -n from fetch-options.txt The -n option stands for --no-summary in git pull [jes: reworded the description to avoid mentioning 'git-fetch'; also exclude '-n' conditional on git-pull -- ugly because of the missing "else" statement in asciidoc] Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 January 2008, 06:42:36 UTC
2b0d103 Sam Vilain 24 January 2008, 23:10:02 UTC git-svn(1): update instructions for resuming a git-svn clone git-svn expects its references under refs/remotes/*; but these will not be copied or set by "git clone"; put in this man page the manual fiddling that is required with current git-svn to get this to work. Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 January 2008, 06:31:52 UTC
3cf3237 Jakub Narebski 25 January 2008, 11:19:41 UTC autoconf: define NO_SYS_SELECT_H on systems without <sys/select.h>. Pre-POSIX.1-2001 systems don't have <sys/select.h>, but select(2) is declared in <sys/time.h>, which git-compat-util.h includes. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 January 2008, 06:26:08 UTC
81cc66a Robert Schiele 24 January 2008, 18:35:20 UTC Makefile: customization for supporting HP-UX Signed-off-by: Robert Schiele <rschiele@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 January 2008, 05:58:53 UTC
2600973 Robert Schiele 24 January 2008, 18:34:46 UTC pre-POSIX.1-2001 systems do not have <sys/select.h> POSIX.1-2001 has declaration of select(2) in <sys/select.h>, but in the previous version of SUS, it was declared in <sys/time.h> (which is already included in git-compat-util.h). This introduces NO_SYS_SELECT_H macro in the Makefile to be set on older systems, to skip inclusion of <sys/select.h> that does not exist on them. We could check _POSIX_VERSION with 200112L and do this automatically, but earlier it was reported that the approach does not work well on some vintage of HP-UX. Other systems may get _POSIX_VERSION itself wrong. At least for now, this manual configuration is safer. Signed-off-by: Robert Schiele <rschiele@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 January 2008, 22:01:28 UTC
cab31fa Junio C Hamano 24 January 2008, 05:37:12 UTC Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui: Correctly cleanup msgfmt '1 message untranslated' output git-gui: Make the statistics of po2msg match those of msgfmt git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available git-gui: Work around random missing scrollbar in revision list 24 January 2008, 05:37:12 UTC
5a9dd39 Brandon Casey 23 January 2008, 17:21:22 UTC git-commit: exit non-zero if we fail to commit the index In certain rare cases, the creation of the commit object and update of HEAD can succeed, but then installing the updated index will fail. This is most likely caused by a full disk or exceeded disk quota. When this happens the new index file will be removed, and the repository will be left with the original now-out-of-sync index. The user can recover with a "git reset HEAD" once the disk space issue is resolved. We should detect this failure and offer the user some helpful guidance. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 January 2008, 18:10:11 UTC
28678b4 Miklos Vajna 22 January 2008, 22:12:25 UTC git-clone -s: document problems with git gc --prune There is a scenario when using git clone -s and git gc --prune togother is dangerous. Document this. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 January 2008, 18:09:54 UTC
3b8f19a Shawn O. Pearce 23 January 2008, 04:56:15 UTC git-gui: Correctly cleanup msgfmt '1 message untranslated' output In the multiple message case we remove the word "messages" from the statistics output of msgfmt as it looks cleaner on the tty when you are watching the build process. However we failed to strip the word "message" when only 1 message was found to be untranslated or fuzzy, as msgfmt does not produce the 's' suffix. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 23 January 2008, 04:56:15 UTC
2cd9ad2 Shawn O. Pearce 23 January 2008, 04:52:07 UTC git-gui: Make the statistics of po2msg match those of msgfmt The strings we were showing from po2msg didn't exactly match those of msgfmt's --statistics output so we didn't show quite the same results when building git-gui's message files. Now we're closer to what msgfmt shows (at least for an en_US locale) so the make output matches. I noticed that the fuzzy translation count is off by one for the current po/zh_cn.po file. Not sure why and I'm not going to try and debug it at this time as the po2msg is strictly a fallback, users building from source really should prefer msgfmt. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 23 January 2008, 04:52:07 UTC
3470ada Shawn O. Pearce 23 January 2008, 04:44:36 UTC git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available If msgfmt fails with exit code 127 that typically means the program is not found in the user's PATH and thus cannot be executed by make. In such a case we can try to fallback to the Tcl based po2msg program that we distributed with git-gui, as it does a "good enough" job. We still don't default to po2msg.sh however as it does not perform a lot of the sanity checks that msgfmt does, and quite a few of those are too useful to give up. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 23 January 2008, 04:44:36 UTC
3ddff72 Shawn O. Pearce 22 January 2008, 15:40:13 UTC git-gui: Work around random missing scrollbar in revision list If the horizontal scrollbar isn't currently visible (because it has not been needed) but we get an update to the scroll port we may find the scrollbar window exists but the Tcl command doesn't. Apparently it is possible for Tk to have partially destroyed the scrollbar by removing the Tcl procedure name but still leaving the widget name in the window registry. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 23 January 2008, 04:37:15 UTC
3b839fd Eric Wong 21 January 2008, 22:37:41 UTC git-svn: default to repacking every 1000 commits This should reduce disk space usage when doing large imports. We'll be switching to "gc --auto" post-1.5.4 to handle repacking for us. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 January 2008, 09:45:40 UTC
4f5f998 Junio C Hamano 22 January 2008, 01:34:43 UTC Clarify that http-push being temporarily disabled with older cURL Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 January 2008, 08:48:29 UTC
6fc7470 Nicolas Pitre 21 January 2008, 16:07:15 UTC pack-objects: Fix segfault when object count is less than thread count When partitioning the work amongst threads, dividing the number of objects by the number of threads may return 0 when there are less objects than threads; this will cause the subsequent code to segfault when accessing list[sub_size-1]. Allow some threads to have zero objects to work on instead of barfing, while letting others to have more. Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 January 2008, 01:24:12 UTC
9288bed Alex Riesen 21 January 2008, 20:53:25 UTC Make t5710 more strict when creating nested repos The test 'creating too deep nesting' can fail even when cloning the repos, but is not its main purpose (it has to prepare nested repos and ensure the last one is invalid). So split the test into the creation and invalidity checking parts. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 January 2008, 01:24:12 UTC
97394ee Gustaf Hendeby 21 January 2008, 19:57:46 UTC send-email, fix breakage in combination with --compose This fixes the subtile bug in git send-email that was introduced into git send-email with aa54892f5ada8282643dc7387b33261c7135d784 (send-email: detect invocation errors earlier), which caused no patches to be sent out if the --compose flag was used. Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Tested-by: Seth Falcon <seth@userprimary.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 January 2008, 01:24:12 UTC
7422bac Shawn O. Pearce 21 January 2008, 04:37:01 UTC Document the hairy gfi_unpack_entry part of fast-import Junio pointed out this part of fast-import wasn't very clear on initial read, and it took some time for someone who was new to fast-import's "dirty little tricks" to understand how this was even working. So a little bit of commentary in the proper place may help future readers. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 January 2008, 09:04:12 UTC
bb23fdf Shawn O. Pearce 21 January 2008, 04:36:54 UTC Teach fast-import to honor pack.compression and pack.depth We now use the configured pack.compression and pack.depth values within fast-import, as like builtin-pack-objects fast-import is generating a packfile for consumption by the Git tools. We use the same behavior as builtin-pack-objects does for these options, allowing core.compression to supply the default value for pack.compression. The default setting for pack.depth within fast-import is still 10 as users will generally repack fast-import generated packfiles by `repack -f`. A large delta depth within the fast-import packfile can significantly slow down such a later repack. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 January 2008, 09:04:10 UTC
c4a95c9 Steffen Prohaska 21 January 2008, 06:41:27 UTC submodule: Document the details of the command line syntax Only "status" accepts "--cached" and the preferred way of passing sub-command specific options is after the sub-command. The documentation is adapted to reflect this. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 January 2008, 08:57:51 UTC
a2d93ae Junio C Hamano 15 January 2008, 11:13:55 UTC git-submodule: add test for the subcommand parser fix This modifies the existing t7400 test to use 'init' as the pathname that a submodule is bound to. Without the earlier subcommand parser fix, this fails. Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 January 2008, 04:57:42 UTC
5c08dbb Junio C Hamano 15 January 2008, 10:48:45 UTC git-submodule: fix subcommand parser The subcommand parser of "git submodule" made its subcommand names reserved words. As a consequence, a command like this: $ git submodule add init update which is meant to add a submodule called 'init' at path 'update' was misinterpreted as a request to invoke more than one mutually incompatible subcommands and incorrectly rejected. This patch fixes the issue by stopping the subcommand parsing at the first subcommand word, to allow the sample command line above to work as expected. It also introduces the usual -- option disambiguator, so that a submodule at path '-foo' can be updated with $ git submodule update -- -foo without triggering an "unrecognized option -foo" error. Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 January 2008, 04:57:42 UTC
23a485e Junio C Hamano 15 January 2008, 10:35:49 UTC git-submodule: rename shell functions for consistency This renames the shell functions used in git-submodule that implement top-level subcommands. The rule is that the subcommand $foo is implemented by cmd_$foo function. A noteworthy change is that modules_list() is now known as cmd_status(). There is no "submodule list" command. Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 January 2008, 04:57:42 UTC
36a189c Junio C Hamano 21 January 2008, 04:36:16 UTC Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui: Correct encoding of glossary/fr.po to UTF-8 git-gui: Consolidate hook execution code into a single function git-gui: Correct window title for hook failure dialogs git-gui: Honor the standard commit-msg hook 21 January 2008, 04:36:16 UTC
6caaf2d Shawn O. Pearce 21 January 2008, 04:03:23 UTC git-gui: Correct encoding of glossary/fr.po to UTF-8 Junio noticed this was incorrectly added in ISO-8859-1 but it should be in UTF-8 (as the headers claim UTF-8, and our convention is to use only UTF-8). Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 21 January 2008, 04:03:23 UTC
ed76cb7 Shawn O. Pearce 20 January 2008, 19:46:59 UTC git-gui: Consolidate hook execution code into a single function The code we use to test if a hook is executable or not differs on Cygwin from the normal POSIX case. Rather then repeating that for all three hooks we call in our commit code path we can place the common logic into a global procedure and invoke it when necessary. This also lets us get rid of the ugly "|& cat" we were using before as we can now rely on the Tcl 8.4 feature of "2>@1" or fallback to the "|& cat" when necessary. The post-commit hook is now run through the same API, but its outcome does not influence the commit status. As a result we now show any of the errors from the post-commit hook in a dialog window, instead of on the user's tty that was used to launch git-gui. This resolves a long standing bug related to not getting errors out of the post-commit hook when launched under git-gui. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 21 January 2008, 03:45:38 UTC
c87238e Shawn O. Pearce 20 January 2008, 19:43:38 UTC git-gui: Correct window title for hook failure dialogs During i18n translation work this message was partially broken by using "append" instead of "strcat" to join the two different parts of the message together. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 21 January 2008, 03:45:37 UTC
fb0ca47 Shawn O. Pearce 20 January 2008, 19:11:52 UTC git-gui: Honor the standard commit-msg hook Under core Git the git-commit tool will invoke the commit-msg hook if it exists and is executable to the user running git-commit. As a hook it has some limited value as it cannot alter the commit, but it can modify the message the user is attempting to commit. It is also able to examine the message to ensure it conforms to some local standards/conventions. Since the hook takes the name of a temporary file holding the message as its only parameter we need to move the code that creates the temp file up earlier in our commit code path, and then pass through that file name to the latest stage (where we call git-commit-tree). We let the hook alter the file as it sees fit and we don't bother to look at its content again until the commit succeeded and we need the subject for the reflog update. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 21 January 2008, 03:45:37 UTC
ce33288 Junio C Hamano 21 January 2008, 01:04:53 UTC GIT 1.5.4-rc4 Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 January 2008, 01:05:11 UTC
105c21d Junio C Hamano 21 January 2008, 00:58:38 UTC Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui: Makefile - Handle $DESTDIR on Cygwin git-gui: add french glossary: glossary/fr.po git-gui: Refresh file status description after hunk application git-gui: Allow 'Create New Repository' on existing directories git-gui: Initial french translation git-gui: Improve German translation. git-gui: Updated Swedish translation after mailing list review. git-gui: Fix broken revert confirmation. git-gui: Update German translation git-gui: Update glossary: add term "hunk" 21 January 2008, 00:58:38 UTC
a41acc6 Junio C Hamano 21 January 2008, 00:57:56 UTC Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: [PATCH] gitk: make Ctrl "+" really increase the font size 21 January 2008, 00:57:56 UTC
3057ded Grégoire Barbier 19 January 2008, 15:22:50 UTC http-push and http-fetch: handle URLs without trailing / The URL to a repository http-push and http-fetch takes should have a trailing slash. Instead of failing the request, add it ourselves before attempting such a request. Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 January 2008, 23:18:34 UTC
325ce39 Junio C Hamano 20 January 2008, 23:00:54 UTC http-push: clarify the reason of error from the initial PROPFIND request The first thing http-push does is a PROPFIND to see if the other end supports locking. The failure message we give is always reported as "no DAV locking support at the remote repository", regardless of the reason why we ended up not finding the locking support on the other end. This moves the code to report "no DAV locking support" down the codepath so that the message is issued only when we successfully get a response to PROPFIND and the other end say it does not support locking. Other failures, such as connectivity glitches and credential mismatches, have their own error message issued and we will not issue "no DAV locking" error (we do not even know if the remote end supports it). Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 January 2008, 23:17:58 UTC
9bdbaba Grégoire Barbier 19 January 2008, 15:22:48 UTC http-push: fail when info/refs exists and is already locked Failing instead of silently not updating remote refs makes the things clearer for the user when trying to push on a repository while another person do (or while a dandling locks are waiting for a 10 minutes timeout). When silently not updating remote refs, the user does not even know that git has pushed the objects but leaved the refs as they were before (e.g. a new bunch of commits on branch "master" is uploaded, however the branch by itsel still points on the previous head commit). Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 January 2008, 23:17:58 UTC
9116de5 Grégoire Barbier 19 January 2008, 15:22:47 UTC http-push: fix webdav lock leak. Releasing webdav lock even if push fails because of bad (or no) reference on command line. To reproduce the issue that this patch fixes, prepare a test repository availlable over http+webdav, say at http://myhost/myrepo.git/ Then: $ git clone http://myhost/myrepo.git/ $ cd myrepo $ git push http Fetching remote heads... refs/ refs/heads/ refs/tags/ No refs in common and none specified; doing nothing. $ git push http Fetching remote heads... refs/ refs/heads/ refs/tags/ No refs in common and none specified; doing nothing. $ Finally, you look at the web server logs, and will find one LOCK query and no UNLOCK query, of course the second one will be in 423 return code instead of 200: 1.2.3.4 - gb [19/Jan/2008:14:24:56 +0100] "LOCK /myrepo.git/info/refs HTTP/1.1" 200 465 (...) 1.2.3.4 - gb [19/Jan/2008:14:25:10 +0100] "LOCK /myrepo.git/info/refs HTTP/1.1" 423 363 With this patch, there would have be two UNLOCKs in addition of the LOCKs From the user's point of view: - If you realize that you should have typed e.g. "git push http master" instead of "git push http", you will have to wait for 10 minutes for the lock to expire by its own. - Furthermore, if somebody else is dumb enough to type "git push http" while you need to push "master" branch, then you'll need too to wait for 10 minutes too. Signed-off-by: Gr.ANigoire Barbier <gb@gbarbier.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 January 2008, 23:17:58 UTC
0a61779 Martin Koegler 19 January 2008, 17:35:23 UTC parse_commit_buffer: tighten checks while parsing This tightens the parsing of a commit object in a couple of ways. - The "tree " header must end with a LF (earlier we did not check this condition). - Make sure parsing of timestamp on the "committer " header does not go beyond the buffer, even when (1) the "author " header does not end with a LF (this means that the commit object is malformed and lacks the committer information) or (2) the "committer " header does not have ">" that is the end of the e-mail address, or (3) the "committer " header does not end with a LF. We however still keep the existing behaviour to return a parsed commit object even when non-structural headers such as committer and author are malformed, so that tools that need to look at commits to clean up a history with such broken commits can still get at the structural data (i.e. the parents chain and the tree object). Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 January 2008, 19:00:57 UTC
a3b811a Dan McGee 20 January 2008, 06:54:57 UTC Update git-completion for new 'remote rm' option Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 January 2008, 07:06:02 UTC
233808d Jim Meyering 19 January 2008, 15:23:32 UTC doc typo: s/prior committing/prior to committing/ Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 January 2008, 19:25:37 UTC
fdcf39e Miklos Vajna 18 January 2008, 22:58:57 UTC Include rev-list options in git-log manpage. Replace the "This manual page describes only the most frequently used options." text with the list of rev-list options in git-log manpage. (The git-diff-tree options are already included.) Move these options to a separate file and include it from both git-rev-list.txt and git-log.txt. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 January 2008, 23:09:08 UTC
f854824 Grégoire Barbier 13 January 2008, 19:02:59 UTC http-push: disable http-push without USE_CURL_MULTI Make http-push always fail when not compiled with USE_CURL_MULTI, since otherwise it corrupts the remote repository (and then fails anyway). Signed-off-by: Grégoire Barbier <gb@gbarbier.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 January 2008, 21:50:06 UTC
c764a0c Jeff King 18 January 2008, 14:20:10 UTC send-email: add no-validate option Since we are now sanity-checking the contents of patches and refusing to send ones with long lines, this knob provides a way for the user to override the new behavior (if, e.g., he knows his SMTP path will handle it). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 January 2008, 21:33:57 UTC
747bbff Jeff King 18 January 2008, 14:19:48 UTC send-email: validate patches before sending anything We try to catch errors early so that we don't end up sending half of a broken patch series. Right now the only validation is checking that line-lengths are under the SMTP-mandated limit of 998. The validation parsing is very crude (it just checks each line length without understanding the mailbox format) but should work fine for this simple check. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 January 2008, 21:33:08 UTC
aa54892 Jeff King 18 January 2008, 14:19:36 UTC send-email: detect invocation errors earlier We never even look at the command line arguments until after we have prompted the user for some information. So running "git send-email" without arguments would prompt for "from" and "to" headers, only to then die with "No patch files specified." Instead, let's try to do as much error checking as possible before getting user input. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 January 2008, 21:29:32 UTC
5a7b1b5 Jim Meyering 18 January 2008, 18:35:49 UTC fast-import: Don't use a maybe-clobbered errno value Without this change, each diagnostic could use an errno value clobbered by the close or unlink in rollback_lock_file. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 January 2008, 21:19:37 UTC
1812564 Lars Hjemli 14 January 2008, 16:36:34 UTC Move sha1_file_to_archive into libgit When the specfile (export-subst) attribute was introduced, it added a dependency from archive-{tar|zip}.c to builtin-archive.c. This broke the support for archive-operations in libgit.a since builtin-archive.o doesn't belong in libgit.a. This patch moves the functions required by libgit.a from builtin-archive.c to the new file archive.c (which becomes part of libgit.a). Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 January 2008, 20:33:50 UTC
472ca78 Jeff King 17 January 2008, 15:03:06 UTC color unchanged lines as "plain" in "diff --color-words" These were mistakenly being colored in "meta" color. Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 January 2008, 09:29:38 UTC
bfa8fcc Jakub Narebski 18 January 2008, 01:03:51 UTC autoconf: Add checking for unsetenv function Update configure.ac (and config.mak.in) by adding test for unsetenv (NO_UNSETENV). Add comment about NO_UNSETENV to Makefile header, as original commit 731043fd adding compat/unsetenv.c didn't do that. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 January 2008, 07:35:36 UTC
5221ecb Thomas Zander 16 January 2008, 22:48:21 UTC core-tutorial typofix Signed-off-by: Thomas Zander <zander@kde.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 January 2008, 06:55:25 UTC
5c66d0d Junio C Hamano 18 January 2008, 06:52:40 UTC Officially deprecate repo-config. Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 January 2008, 06:52:40 UTC
c9ced05 Shawn O. Pearce 18 January 2008, 03:57:00 UTC Fix random fast-import errors when compiled with NO_MMAP fast-import was relying on the fact that on most systems mmap() and write() are synchronized by the filesystem's buffer cache. We were relying on the ability to mmap() 20 bytes beyond the current end of the file, then later fill in those bytes with a future write() call, then read them through the previously obtained mmap() address. This isn't always true with some implementations of NFS, but it is especially not true with our NO_MMAP=YesPlease build time option used on some platforms. If fast-import was built with NO_MMAP=YesPlease we used the malloc()+pread() emulation and the subsequent write() call does not update the trailing 20 bytes of a previously obtained "mmap()" (aka malloc'd) address. Under NO_MMAP that behavior causes unpack_entry() in sha1_file.c to be unable to read an object header (or data) that has been unlucky enough to be written to the packfile at a location such that it is in the trailing 20 bytes of a window previously opened on that same packfile. This bug has gone unnoticed for a very long time as it is highly data dependent. Not only does the object have to be placed at the right position, but it also needs to be positioned behind some other object that has been accessed due to a branch cache invalidation. In other words the stars had to align just right, and if you did run into this bug you probably should also have purchased a lottery ticket. Fortunately the workaround is a lot easier than the bug explanation. Before we allow unpack_entry() to read data from a pack window that has also (possibly) been modified through write() we force all existing windows on that packfile to be closed. By closing the windows we ensure that any new access via the emulated mmap() will reread the packfile, updating to the current file content. This comes at a slight performance degredation as we cannot reuse previously cached windows when we update the packfile. But it is a fairly minor difference as the window closes happen at only two points: - When the packfile is finalized and its .idx is generated: At this stage we are getting ready to update the refs and any data access into the packfile is going to be random, and is going after only the branch tips (to ensure they are valid). Our existing windows (if any) are not likely to be positioned at useful locations to access those final tip commits so we probably were closing them before anyway. - When the branch cache missed and we need to reload: At this point fast-import is getting change commands for the next commit and it needs to go re-read a tree object it previously had written out to the packfile. What windows we had (if any) are not likely to cover the tree in question so we probably were closing them before anyway. We do try to avoid unnecessarily closing windows in the second case by checking to see if the packfile size has increased since the last time we called unpack_entry() on that packfile. If the size has not changed then we have not written additional data, and any existing window is still vaild. This nicely handles the cases where fast-import is going through a branch cache reload and needs to read many trees at once. During such an event we are not likely to be updating the packfile so we do not cycle the windows between reads. With this change in place t9301-fast-export.sh (which was broken by c3b0dec509fe136c5417422f31898b5a4e2d5e02) finally works again. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 January 2008, 06:39:20 UTC
fb54abd Brandon Casey 17 January 2008, 16:58:34 UTC fast-import.c: don't try to commit marks file if write failed We also move the assignment of -1 to the lock file descriptor up, so that rollback_lock_file() can be called safely after a possible attempt to fclose(). This matches the contents of the 'if' statement just above testing success of fdopen(). Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 January 2008, 06:11:42 UTC
a028557 Mark Levedahl 18 January 2008, 03:50:23 UTC git-gui: Makefile - Handle $DESTDIR on Cygwin gg_libdir is converted to an absolute Windows path on Cygwin, but a later step attempts to prefix $DESTDIR to install to a staging directory. Explicitly separate the uses of gg_libdir for these two purposes so installation to $DESTDIR will work. Signed-off-by: Mark Levedahl <mdl123@verizon.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 18 January 2008, 03:58:24 UTC
a1f8f50 Christian Couder 16 January 2008, 07:19:34 UTC git-gui: add french glossary: glossary/fr.po Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 18 January 2008, 02:35:01 UTC
b531394 Brandon Casey 16 January 2008, 19:14:30 UTC refs.c: rework ref_locks by abstracting from underlying struct lock_file Instead of calling close_lock_file() and commit_lock_file() directly, which take a struct lock_file argument, add two new functions: close_ref() and commit_ref(), which handle calling the previous lock_file functions and modifying the ref_lock structure. Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 January 2008, 23:36:10 UTC
4ed7cd3 Brandon Casey 16 January 2008, 19:12:46 UTC Improve use of lockfile API Remove remaining double close(2)'s. i.e. close() before commit_locked_index() or commit_lock_file(). Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 January 2008, 23:35:35 UTC
d6cf61b Brandon Casey 16 January 2008, 19:05:32 UTC close_lock_file(): new function in the lockfile API The lockfile API is a handy way to obtain a file that is cleaned up if you die(). But sometimes you would need this sequence to work: 1. hold_lock_file_for_update() to get a file descriptor for writing; 2. write the contents out, without being able to decide if the results should be committed or rolled back; 3. do something else that makes the decision --- and this "something else" needs the lockfile not to have an open file descriptor for writing (e.g. Windows do not want a open file to be renamed); 4. call commit_lock_file() or rollback_lock_file() as appropriately. This adds close_lock_file() you can call between step 2 and 3 in the above sequence. Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 January 2008, 23:35:03 UTC
0c0478c Junio C Hamano 16 January 2008, 19:00:13 UTC Document lockfile API We have nice set of placeholders, but nobody stepped in to fill the gap in the API documentation, so I am doing it myself. Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 January 2008, 20:42:37 UTC
c3b0dec Linus Torvalds 15 January 2008, 23:50:17 UTC Be more careful about updating refs This makes write_ref_sha1() more careful: it actually checks the SHA1 of the ref it is updating, and refuses to update a ref with an object that it cannot find. Perhaps more importantly, it also refuses to update a branch head with a non-commit object. I don't quite know *how* the stable series maintainers were able to corrupt their repository to have a HEAD that pointed to a tag rather than a commit object, but they did. Which results in a totally broken repository that cannot be cloned or committed on. So make it harder for people to shoot themselves in the foot like that. The test t1400-update-ref.sh is fixed at the same time, as it assumed that the commands involved in the particular test would not care about corrupted repositories whose refs point at nonexistant bogus objects. That assumption does not hold true anymore. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 January 2008, 19:53:35 UTC
9f6fe82 Bill Lear 16 January 2008, 12:46:53 UTC Correct spelling in diff.c comment Correct a spelling mistake in a comment. Signed-off-by: Bill Lear <rael@zopyra.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 January 2008, 19:37:58 UTC
b98525e Dave Peticolas 16 January 2008, 05:16:05 UTC Documentation: fix and clarify grammar in git-merge docs. Signed-off-by: Dave Peticolas <dave@krondo.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 January 2008, 19:37:57 UTC
6232f62 Linus Torvalds 16 January 2008, 00:34:17 UTC Make 'git fsck' complain about non-commit branches Since having non-commits in branches is a no-no, and just means you cannot commit on them, let's make fsck tell you when a branch is bad. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 January 2008, 19:37:57 UTC
7c3fd25 Linus Torvalds 16 January 2008, 00:12:33 UTC Make builtin-commit.c more careful about parenthood When creating the commit object, be a whole lot more careful about making sure that the parent lines really are valid parent lines. Check things like MERGE_HEAD having proper SHA1 lines in it, and double-check that all the parents exist and are actually commits. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 January 2008, 19:37:34 UTC
2862419 Dmitry Potapov 16 January 2008, 01:59:12 UTC treat any file with NUL as binary There are two heuristics in Git to detect whether a file is binary or text. One in xdiff-interface.c (which is taken from GNU diff) relies on existence of the NUL byte at the beginning. However, convert.c used a different heuristic, which relied on the percent of non-printable symbols (less than 1% for text files). Due to differences in detection whether a file is binary or not, it was possible that a file that diff treats as binary could be treated as text by CRLF conversion. This is very confusing for a user who sees that 'git diff' shows the file as binary expects it to be added as binary. This patch makes is_binary to consider any file that contains at least one NUL character as binary, to ensure that the heuristics used for CRLF conversion is tighter than what is used by diff. Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 January 2008, 17:10:34 UTC
a41e45e Shawn O. Pearce 16 January 2008, 06:29:39 UTC git-gui: Refresh file status description after hunk application If we apply a hunk in either direction this may change the file's status. For example if a file is completely unstaged, and has at least two hunks in it and the user stages one hunk the file will change from "Modified, not staged" to "Portions staged for commit". Resetting the file path causes our trace on this variable to fire; that trace is used to update the file header in the diff viewer to the file's current status. Noticed by Johannes Sixt. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 16 January 2008, 06:29:39 UTC
d36a8f7 Shawn O. Pearce 16 January 2008, 06:14:42 UTC git-gui: Allow 'Create New Repository' on existing directories Often users setup a few source files and get a project rolling before they create a Git repository for it. In such cases the core Git tools allow users to initialize a new repository by simply running `git init` at the desired root level directory. We need to allow the same situation in git-gui; if the user is trying to make a new repository we should let them do that to any location they chose. If the directory already exists and already has files contained within it we still should allow the user to create a repository there. However we still need to disallow creating a repository on top of an existing repository. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 16 January 2008, 06:14:42 UTC
daaa958 Christian Couder 16 January 2008, 05:51:40 UTC git-gui: Initial french translation Here are some of the choices made to translate Git Gui to french: - commit -> "commit" (noun) or "commiter" (verb) - stage (index) -> "pré-commit" (noun) or "pré-commiter" (verb) - (re)scan -> "(re)synchroniser" - reset -> "réinitialiser" - checkout -> "emprunt" (noun) or "emprunter" (verb) - revision expression -> "expression de révison" I am not completely happy with these, but it's a start... [sp: Inserted a missing LF in message on line 466] Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 16 January 2008, 06:01:19 UTC
d71b565 Christian Stimming 15 January 2008, 19:41:39 UTC git-gui: Improve German translation. Change translation of "clone" back to "klonen" because "kopieren" is a much broader term than this particular git action. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 16 January 2008, 05:50:20 UTC
10899a8 Peter Karlsson 12 January 2008, 08:28:57 UTC git-gui: Updated Swedish translation after mailing list review. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 16 January 2008, 05:50:10 UTC
d454460 Christian Stimming 08 January 2008, 20:21:15 UTC git-gui: Fix broken revert confirmation. I broke this extremely cool feature in 1ac17950, but it is rather easy to fix this. Sorry for that. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 16 January 2008, 05:44:14 UTC
898ff9e Christian Stimming 07 January 2008, 21:00:25 UTC git-gui: Update German translation "revert" translated as "verwerfen". "hunk" translated as "Kontext". Several menu items reworded to be shorter. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 16 January 2008, 05:42:41 UTC
b3125ad Christian Stimming 07 January 2008, 20:48:55 UTC git-gui: Update glossary: add term "hunk" Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 16 January 2008, 05:42:37 UTC
4439751 Kristian Høgsberg 15 January 2008, 20:00:02 UTC git-commit: fix double close(2) that can close a wrong file descriptor The codepath to prepare index files for the temporary and next index file was closing file descriptor it obtained from the lockfile API by hand, without letting the API know that the fd should not be doubly closed. This is not usually a problem (except it may get EBADFD) but if we opened another fd for an entirely unrelated purpose (say, an fd used to mmap a packfile) between the time we close the fd to the index file and the time we commit or rollback the lockfile (causing it to also try closing the recorded fd), the lockfile API will close an incorrect file descriptor that is still used for an entirely unrelated purpose. There's four close(fd) calls in prepare_index() and they're all incorrect. The open fd's are cleaned up in rollback_index_files() and shouldn't be closed manually. The patch below gets rid of the extra close() calls and should fix the problem. Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 January 2008, 01:33:53 UTC
back to top