Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
sort by:
Revision Author Date Message Commit Date
661763a Junio C Hamano 25 February 2009, 22:50:52 UTC GIT 1.6.2-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 February 2009, 22:50:52 UTC
bb0cebd Junio C Hamano 25 February 2009, 22:48:30 UTC Merge branch 'jc/maint-1.6.0-pack-directory' * jc/maint-1.6.0-pack-directory: Make sure objects/pack exists before creating a new pack 25 February 2009, 22:50:05 UTC
6e180cd Junio C Hamano 25 February 2009, 07:11:29 UTC Make sure objects/pack exists before creating a new pack In a repository created with git older than f49fb35 (git-init-db: create "pack" subdirectory under objects, 2005-06-27), objects/pack/ directory is not created upon initialization. It was Ok because subdirectories are created as needed inside directories init-db creates, and back then, packfiles were recent invention. After the said commit, new codepaths started relying on the presense of objects/pack/ directory in the repository. This was exacerbated with 8b4eb6b (Do not perform cross-directory renames when creating packs, 2008-09-22) that moved the location temporary pack files are created from objects/ directory to objects/pack/ directory, because moving temporary to the final location was done carefully with lazy leading directory creation. Many packfile related operations in such an old repository can fail mysteriously because of this. This commit introduces two helper functions to make things work better. - odb_mkstemp() is a specialized version of mkstemp() to refactor the code and teach it to create leading directories as needed; - odb_pack_keep() refactors the code to create a ".keep" file while create leading directories as needed. Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 February 2009, 22:39:42 UTC
69707d6 Jay Soffian 25 February 2009, 08:28:15 UTC Allow HTTP tests to run on Darwin This patch allows the HTTP tests to run on OS X 10.5. It is not sufficient to be able to pass in LIB_HTTPD_PATH and LIB_HTTPD_MODULE_PATH alone, as the apache.conf also needs a couple tweaks. These changes are put into an <IfDefine> to keep them Darwin specific, but this means lib-httpd.sh needs to be modified to pass -DDarwin to apache when running on Darwin. As long as we're making this change to lib-httpd.sh, we may as well set LIB_HTTPD_PATH and LIB_HTTPD_MODULE_PATH to appropriate default values for the platform. Note that we now pass HTTPD_PARA to apache at shutdown as well. Otherwise apache will emit a harmless, but noisy warning that LogFormat is an unknown directive. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 February 2009, 21:58:57 UTC
3dbe116 Michael J Gruber 25 February 2009, 14:05:17 UTC Fix typo in contrib/examples/git-svnimport.txt Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 February 2009, 16:33:14 UTC
3f74c8e Johannes Sixt 25 February 2009, 07:54:42 UTC gitattributes.txt: Path matching rules are explained in gitignore.txt The rules how the patterns are matched against path names are the same for .gitattribute and .gitignore files. This also replace the notion "glob pattern" by "pattern" because gitignore.txt talks about "glob" only in some contexts where the pattern is mentioned. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 February 2009, 08:49:54 UTC
a9d98a1 Felipe Contreras 24 February 2009, 21:59:05 UTC sha1_file.c: fix typo it's != its Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 February 2009, 08:49:54 UTC
9ccb3bc Felipe Contreras 24 February 2009, 21:59:03 UTC git add: trivial codestyle cleanup Global static variables don't need to be initialized to 0/NULL. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 February 2009, 08:49:54 UTC
aa98eb3 Christian Couder 24 February 2009, 20:16:37 UTC README: fix path to "gitcvs-migration.txt" and be more consistent README suggested to look at "Documentation/gittutorial.txt" for the tutorial and to use "man git-commandname" for documentation of each command. This was not consistent because the tutorial can also be available with "man gittutorial" once git is installed, and the documentation for each command can be available at "Documentation/git-commandname.txt" before installing git. This patch tries to make the description more consistent. It also fixes the path to the cvs-migration documentation that changed from "Documentation/cvs-migration.txt" to "Documentation/gitcvs-migration.txt". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 February 2009, 08:49:54 UTC
a8fdab0 Allan Caffee 25 February 2009, 01:22:20 UTC trace: Fixed a minor typo in an error message. Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 February 2009, 08:49:53 UTC
149f6dd Marc Branchaud 19 February 2009, 17:39:47 UTC Docs: Expand explanation of the use of + in git push refspecs. Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 February 2009, 08:49:53 UTC
6ab149e Gerrit Pape 24 February 2009, 09:00:06 UTC git-quiltimport: preserve standard input to be able to read user input When run without --author and it fails to determine an author, git quiltimport tries `read patch_author` to get user input, but standard input has been redirected to the patch series file. This commit lets quiltimport read the series file through file descriptor 3 so that the standard input is preserved. Reported by Uwe Kleine-König through http://bugs.debian.org/515910 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 February 2009, 08:49:13 UTC
6a0861a Gerrit Pape 24 February 2009, 08:58:16 UTC Install builtins with the user and group of the installing personality If 'make install' was run with sufficient privileges, then the installed builtins in gitexecdir, which are either hardlinked, symlinked, or copied, would receive the user and group of whoever built git. With this commit the initial hardlink or copy is done from the installation tree and not the build tree to fix this. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 February 2009, 05:46:31 UTC
48b6026 Junio C Hamano 25 February 2009, 05:13:32 UTC Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: git-svn fix to avoid using strftime %z 25 February 2009, 05:13:32 UTC
3ca9364 Abhijit Menon-Sen 25 February 2009, 03:03:14 UTC Convert git-* invocations to "git *" in the svnimport example. After these changes, git-svnimport worked fine for me. Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 February 2009, 05:10:57 UTC
e871784 Ben Walton 24 February 2009, 19:44:49 UTC git-svn fix to avoid using strftime %z %z isn't available on all platforms in the date formatting routines. Provide a workalike capability that should be more portable. Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Acked-by: Eric Wong <normalperson@yhbt.net> 24 February 2009, 21:45:36 UTC
d43c07b Junio C Hamano 24 February 2009, 03:14:13 UTC Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: git-svn: read the dcommit url from the config file on a per remote basis git-svn: fix delete+add branch tracking with empty files git-svn: Create leading directories in create-ignore 24 February 2009, 03:14:13 UTC
b4b0ba0 Pete Wyckoff 18 February 2009, 18:12:14 UTC git-p4: avoid syncing duplicate changes When a particular changeset affects multiple depot paths, it will appear multiple times in the output of "p4 changes". Filter out the duplicates to avoid the extra empty commits that this otherwise would create. Signed-off-by: Pete Wyckoff <pw@padd.com> Acked-by: Simon Hausmann <simon@lst.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2009, 23:24:08 UTC
0df8405 Peter Oberndorfer 23 February 2009, 11:02:53 UTC git-svn: read the dcommit url from the config file on a per remote basis The commit url for dcommit is determined in the following order: commandline option --commit-url svn.commiturl svn-remote.<name>.commiturl svn-remote.<name>.url Signed-off-by: Peter Oberndorfer <kumbayo84@arcor.de> Acked-by: Eric Wong <normalperson@yhbt.net> 23 February 2009, 21:50:24 UTC
83c2fcf Eric Wong 23 February 2009, 04:25:00 UTC git-svn: fix delete+add branch tracking with empty files Original bug report and test case by Björn Steinbrink. Björn Steinbrink <B.Steinbrink@gmx.de> wrote: > Hi Eric, > > seems that the empty symlink stuff gets confused about which revision to > use when looking for the parent's file. > > r3 = f1a6fcf6b0a1c4a373d0b2b65a3d70700084f361 (tags/1.0.1) > Found possible branch point: file:///home/doener/h/svn/tags/1.0 => file:///home/doener/h/svn/branches/1.0, 4 > Found branch parent: (1.0) 63ae640ba01014ecbb3df590999ed1fa5914545b > Following parent with do_switch > Successfully followed parent > r5 = 26fcfef5bcced97ab74faf1af7341a2ae0d272aa (1.0) > Found possible branch point: file:///home/doener/h/svn/branches/1.0 => file:///home/doener/h/svn/tags/1.0.1, 5 > Found branch parent: (tags/1.0.1) 26fcfef5bcced97ab74faf1af7341a2ae0d272aa > Following parent with do_switch > Scanning for empty symlinks, this may take a while if you have many empty files > You may disable this with `git config svn.brokenSymlinkWorkaround false'. > This may be done in a different terminal without restarting git svn > Filesystem has no item: File not found: revision 3, path '/branches/1.0/file' at /usr/local/libexec/git-core/git-svn line 3318 > > Note how it tries to look at revision 3 instead of revision 5 (which it > correctly detected as the parent). The import succeeds when > svn.brokenSymlinkWorkaround is set to false. Testcase below. Signed-off-by: Eric Wong <normalperson@yhbt.net> 23 February 2009, 04:31:08 UTC
7d9fd45 Brian Gernhardt 19 February 2009, 18:08:04 UTC git-svn: Create leading directories in create-ignore Since SVN tracks empty directories and git does not, we can not assume that the directory exists when creating .gitignore files. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Acked-by: Eric Wong <normalperson@yhbt.net> 23 February 2009, 04:30:58 UTC
2d602e9 Junio C Hamano 21 February 2009, 18:38:04 UTC Merge branch 'for-junio' of git://source.winehq.org/~julliard/git/git * 'for-junio' of git://source.winehq.org/~julliard/git/git: Add a README in the contrib/emacs directory. git.el: Improve the confirmation message on remove and revert. git.el: Make sure that file lists are sorted as they are created. 21 February 2009, 18:38:04 UTC
6f3c504 Alexandre Julliard 16 February 2009, 10:40:29 UTC Add a README in the contrib/emacs directory. Signed-off-by: Alexandre Julliard <julliard@winehq.org> 21 February 2009, 12:57:53 UTC
5b4e441 Alexandre Julliard 16 February 2009, 10:40:08 UTC git.el: Improve the confirmation message on remove and revert. If there's only one file, print its name instead of just "1 file". Signed-off-by: Alexandre Julliard <julliard@winehq.org> 21 February 2009, 12:49:44 UTC
21ba0e8 Alexandre Julliard 16 February 2009, 10:39:11 UTC git.el: Make sure that file lists are sorted as they are created. This avoids a possibly redundant sort in git-update-status-files and git-status-filenames-map, and allows callers to continue using the list without having to copy it. It also fixes the confusing success messages reported by Brent Goodrick. Signed-off-by: Alexandre Julliard <julliard@winehq.org> 21 February 2009, 12:49:36 UTC
7dff9b3 Linus Torvalds 20 February 2009, 22:15:22 UTC Support 'raw' date format Talking about --date, one thing I wanted for the 1234567890 date was to get things in the raw format. Sure, you get them with --pretty=raw, but it felt a bit sad that you couldn't just ask for the date in raw format. So here's a throw-away patch (meaning: I won't be re-sending it, because I really don't think it's a big deal) to add "--date=raw". It just prints out the internal raw git format - seconds since epoch plus timezone (put another way: 'date +"%s %z"' format) Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 February 2009, 05:45:42 UTC
8c5b85c Junio C Hamano 20 February 2009, 07:44:07 UTC Merge branch 'maint' * maint: More friendly message when locking the index fails. Document git blame --reverse. Documentation: Note file formats send-email accepts 20 February 2009, 07:44:07 UTC
e43a6fd Matthieu Moy 19 February 2009, 12:54:18 UTC More friendly message when locking the index fails. Just saying that index.lock exists doesn't tell the user _what_ to do to fix the problem. We should give an indication that it's normally safe to delete index.lock after making sure git isn't running here. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 February 2009, 07:22:57 UTC
b452cc1 Matthieu Moy 19 February 2009, 12:34:48 UTC Document git blame --reverse. This was introduced in 85af7929ee125385c2771fa4eaccfa2f29dc63c9 but not documented outside the commit message. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 February 2009, 07:22:18 UTC
7d233de Marcel M. Cary 18 February 2009, 03:00:43 UTC gitweb: Hyperlink multiple git hashes on the same commit message line The current implementation only hyperlinks the first hash on a given line of the commit message. It seems sensible to highlight all of them if there are multiple, and it seems plausible that there would be multiple even with a tidy line length limit, because they can be abbreviated as short as 8 characters. Benchmark: I wanted to make sure that using the 'e' switch to the Perl regex wasn't going to kill performance, since this is called once per commit message line displayed. In all three A/B scenarios I tried, the A and B yielded the same results within 2%, where A is the version of code before this patch and B is the version after. 1: View a commit message containing the last 1000 commit hashes 2: View a commit message containing 1000 lines of 40 dots to avoid hyperlinking at the same message length 3: View a short merge commit message with a few lines of text and no hashes All were run in CGI mode on my sub-production hardware on a recent clone of git.git. Numbers are the average of 10 reqests per second with the first request discarded, since I expect this change to affect primarily CPU usage. Measured with ApacheBench. Note that the web page rendered was the same; while the new code supports multiple hashes per line, there was at most one per line. The primary purpose of scenarios 2 and 3 were to verify that the addition of 1000 commit messages had an impact on how much of the time was spent rendering commit messages. They were all within 2% of 0.80 requests per second (much faster). So I think the patch has no noticeable effect on performance. Signed-off-by: Marcel M. Cary <marcel@oak.homeunix.org> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 February 2009, 06:49:55 UTC
024aa7d Johannes Schindelin 19 February 2009, 19:10:53 UTC system_path(): simplify using strip_path_suffix(), and add suffix "git" At least for the author of this patch, the logic in system_path() was too hard to understand. Using the function strip_path_suffix() documents the idea of the code better. The real change is to add the suffix "git", so that a runtime prefix will be computed correctly even when the executable was called in /git/ as is the case in msysGit (Windows insists to search the current directory before the PATH when looking for an executable). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 February 2009, 06:47:39 UTC
4fcc86b Johannes Schindelin 19 February 2009, 19:10:49 UTC Introduce the function strip_path_suffix() The function strip_path_suffix() will try to strip a given suffix from a given path. The suffix must start at a directory boundary (i.e. "core" is not a path suffix of "libexec/git-core", but "git-core" is). Arbitrary runs of directory separators ("slashes") are assumed identical. Example: strip_path_suffix("C:\\msysgit/\\libexec\\git-core", "libexec///git-core", &prefix) will set prefix to "C:\\msysgit" and return 0. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 February 2009, 06:45:48 UTC
c4ba87a Todd Zullinger 19 February 2009, 03:51:06 UTC Documentation: Note file formats send-email accepts Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 February 2009, 06:15:29 UTC
25487f8 Junio C Hamano 18 February 2009, 19:31:52 UTC Merge branch 'maint' * maint: tests: fix "export var=val" Skip timestamp differences for diff --no-index Documentation/git-push: --all, --mirror, --tags can not be combined 18 February 2009, 19:31:52 UTC
91e80b9 Junio C Hamano 18 February 2009, 19:17:27 UTC tests: fix "export var=val" Some shells do not like "export var=val"; the right way to write it is to do an assignment and then export just the variable name. Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 February 2009, 19:17:27 UTC
88e3880 Lars Noschinski 18 February 2009, 08:35:36 UTC filter-branch -d: Export GIT_DIR earlier The improved error handling catches a bug in filter-branch when using -d pointing to a path outside any git repository: $ git filter-branch -d /tmp/foo master fatal: Not a git repository (or any of the parent directories): .git This error message comes from git for-each-ref in line 224. GIT_DIR is set correctly by git-sh-setup (to the foo.git repository), but not exported (yet). Signed-off-by: Lars Noschinski <lars@public.noschinski.de> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 February 2009, 19:15:17 UTC
51b2ead Jay Soffian 18 February 2009, 13:44:02 UTC disallow providing multiple upstream branches to rebase, pull --rebase It does not make sense to provide multiple upstream branches to either git pull --rebase, or to git rebase, so disallow both. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 February 2009, 19:14:04 UTC
d61027b Michael Spang 18 February 2009, 06:48:06 UTC Skip timestamp differences for diff --no-index We display empty diffs for files whose timestamps have changed. Usually, refreshing the index makes those empty diffs go away. However, when not using the index they are not very useful and there is no option to suppress them. This forces on the skip_stat_unmatch option for diff --no-index, suppressing any empty diffs. This option is also used for diffs against the index when "diff.autorefreshindex" is set, but that option does not apply to diff --no-index. Signed-off-by: Michael Spang <mspang@uwaterloo.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 February 2009, 18:55:33 UTC
b94ead7 Junio C Hamano 18 February 2009, 18:48:01 UTC git-svn: fix parsing of timestamp obtained from svn Ward Wouts reports that git-svn barfed like this: Unable to parse date: 2004-03-09T09:44:33.Z at /usr/bin/git-svn line 3995 The parse_svn_date sub expects there always are one or more digits after the decimal point to record fractional seconds, but this example does not and results in a failure like this. The fix is based on the original fix by the reporter, further cleaned up. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Eric Wong <normalperson@yhbt.net> 18 February 2009, 18:48:01 UTC
df5d10a Marcel M. Cary 18 February 2009, 13:09:41 UTC gitweb: Fix warnings with override permitted but no repo override When a feature like "blame" is permitted to be overridden in the repository configuration but it is not actually set in the repository, a warning is emitted due to the undefined value of the repository configuration, even though it's a perfectly normal condition. Emitting warning is grounds for test failure in the gitweb test script. This error was caused by rewrite of git_get_project_config from using "git config [<type>] <name>" for each individual configuration variable checked to parsing "git config --list --null" output in commit b201927 (gitweb: Read repo config using 'git config -z -l'). Earlier version of git_get_project_config was returning empty string if variable do not exist in config; newer version is meant to return undef in this case, therefore change in feature_bool was needed. Additionally config_to_* subroutines were meant to be invoked only if configuration variable exists; therefore we added early return to git_get_project_config: it now returns no value if variable does not exists in config. Otherwise config_to_* subroutines (config_to_bool in paryicular) wouldn't be able to distinguish between the case where variable does not exist and the case where variable doesn't have value (the "[section] noval" case, which evaluates to true for boolean). While at it fix bug in config_to_bool, where checking if $val is defined (if config variable has value) was done _after_ stripping leading and trailing whitespace, which lead to 'Use of uninitialized value' warning. Add test case for features overridable but not overriden in repo config, and case for no value boolean configuration variable. Signed-off-by: Marcel M. Cary <marcel@oak.homeunix.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 February 2009, 18:43:21 UTC
bed5122 Gerrit Pape 17 February 2009, 09:25:02 UTC Documentation/git-push: --all, --mirror, --tags can not be combined While b259f09 made git-push output a better error message for 'git-push --all --tags', this commit fixes the synopsis in the documentation. Inconsistency spotted and fix suggested by Jari Aalto through http://bugs.debian.org/502567 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 February 2009, 18:42:33 UTC
bf3c20f Thomas Rast 16 February 2009, 16:34:57 UTC bash completion: only show 'log --merge' if merging The gitk completion only shows --merge if MERGE_HEAD is present. Do it the same way for git-log completion. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 February 2009, 18:41:45 UTC
a393777 Thomas Rast 16 February 2009, 16:34:56 UTC bash completion: refactor common log, shortlog and gitk options Refactor options that are useful for more than one of them into a variable used by the relevant completions. This has the effect of adding the following options to git-log: --branches --tags --remotes --first-parent --dense --sparse --simplify-merges --simplify-by-decoration --first-parent --no-merges The following to git-shortlog: --branches --tags --remotes --first-parent And the following to gitk: --branches --tags --remotes --first-parent --no-merges --max-count= --max-age= --since= --after= --min-age= --until= --before= --dense --sparse --full-history --simplify-merges --simplify-by-decoration --left-right Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 February 2009, 18:41:37 UTC
81d3fe9 Giuseppe Bilotta 15 February 2009, 09:18:36 UTC gitweb: fix wrong base URL when non-root DirectoryIndex CGI::url() has some issues when rebuilding the script URL if the script is a DirectoryIndex. One of these issue is the inability to strip PATH_INFO, which is why we had to do it ourselves. Another issue is that the resulting URL cannot be used for the <base> tag: it works if we're the DirectoryIndex at the root level, but not otherwise. We fix this by building the proper base URL ourselves, and improve the comment about the need to strip PATH_INFO manually while we're at it. Additionally t/t9500-gitweb-standalone-no-errors.sh had to be modified to set SCRIPT_NAME variable (CGI standard states that it MUST be set, and now gitweb uses it if PATH_INFO is not empty, as is the case for some of tests in t9500). Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 February 2009, 00:19:07 UTC
4a5856c SZEDER Gábor 14 February 2009, 16:21:53 UTC bash: update 'git svn' options 'git svn' got some new subcommands and otions in the last couple of months. This patch adds completion support for them. In particular: * 'fetch', 'clone', etc.: '--ignore-paths=' * 'init' and 'clone': '--prefix=', '--use-log-author', '--add-author-from' * 'dcommit': '--commit-url', '--revision' * 'log': '--color' * 'rebase': '--dry-run' * 'branch', 'tag', 'blame', 'migrate' subcommands and their options 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> 16 February 2009, 22:53:06 UTC
d532ebd SZEDER Gábor 15 February 2009, 13:25:11 UTC bash: add missing 'git merge' options Namely: '--commit', '--stat', '--no-squash', '--ff', '--no-ff'. One might wonder why add options that specify the default behaviour anyway (e.g. '--commit', '--no-squash', etc.). Users can override the default with config options (e.g. 'branch.<name>.mergeoptions', 'merge.log'), but sometimes might still need the default behaviour. 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> 16 February 2009, 22:51:24 UTC
1b7e543 Dévai Tamás 11 February 2009, 23:14:02 UTC git-svn: Fix for rewriteRoot URL containing username. If the new svn root URL given with the svn-remote.<repo>.rewriteRoot config option (or by the --rewrite-root option to 'git svn init') contains a username (such as 'svn+ssh://username@example.com/repo'), find_by_url() cannot find the repository URL, because the URL contained in the commit message does have the username removed. Signed-off-by: Dévai Tamás <devait@mailbox.sk> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 February 2009, 02:04:48 UTC
88a667f René Scharfe 15 February 2009, 18:18:58 UTC builtin-receive-pack.c: fix compiler warnings about format string While all of the strings passed to warning() are, in fact, literals, the compiler doesn't recognize them as such because it doesn't see through the loop used to iterate over them: builtin-receive-pack.c: In function 'warn_unconfigured_deny': builtin-receive-pack.c:247: warning: format not a string literal and no format arguments builtin-receive-pack.c: In function 'warn_unconfigured_deny_delete_current': builtin-receive-pack.c:273: warning: format not a string literal and no format arguments Calm the compiler by adding easily recognizable format string literals. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 February 2009, 19:14:12 UTC
075394e Junio C Hamano 15 February 2009, 08:15:52 UTC RelNotes Update Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 February 2009, 09:49:13 UTC
f7a2bdb Junio C Hamano 15 February 2009, 09:44:58 UTC Merge branch 'mc/setup-cd-p' * mc/setup-cd-p: git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work tree 15 February 2009, 09:44:58 UTC
7b83a92 Junio C Hamano 15 February 2009, 09:44:20 UTC Merge branch 'ff/submodule-no-fetch' * ff/submodule-no-fetch: submodule: add --no-fetch parameter to update command 15 February 2009, 09:44:20 UTC
160d2bc Junio C Hamano 15 February 2009, 09:44:15 UTC Merge branch 'ms/mailmap' * ms/mailmap: Move mailmap documentation into separate file Change current mailmap usage to do matching on both name and email of author/committer. Add map_user() and clear_mailmap() to mailmap Add find_insert_index, insert_at_index and clear_func functions to string_list Add mailmap.file as configurational option for mailmap location 15 February 2009, 09:44:15 UTC
2a8644c Junio C Hamano 15 February 2009, 09:44:11 UTC Merge branch 'jn/gitweb-committag' * jn/gitweb-committag: gitweb: Better regexp for SHA-1 committag match 15 February 2009, 09:44:11 UTC
c42b04b Junio C Hamano 15 February 2009, 09:43:57 UTC Merge branch 'rc/http-push' * rc/http-push: use a hash of the lock token as the suffix for PUT/MOVE 15 February 2009, 09:43:57 UTC
dfab7c1 Tay Ray Chuan 14 February 2009, 09:52:14 UTC use a hash of the lock token as the suffix for PUT/MOVE After 753bc91 ("Remove the requirement opaquelocktoken uri scheme"), lock tokens are in the URI forms in which they are received from the server, eg. 'opaquelocktoken:', 'urn:uuid:'. However, "start_put" (and consequently "start_move"), which attempts to create a unique temporary file using the UUID of the lock token, inadvertently uses the lock token in its URI form. These file operations on the server may not be successful (specifically, in Windows), due to the colon ':' character from the URI form of the lock token in the file path. This patch uses a hash of the lock token instead, guaranteeing only "safe" characters (a-f, 0-9) are used in the file path. The token's hash is generated when the lock token is received from the server in handle_new_lock_ctx, minimizing the number of times of hashing. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 February 2009, 08:57:43 UTC
43e35f6 Junio C Hamano 15 February 2009, 08:05:11 UTC Merge branch 'js/gc-prune' * js/gc-prune: gc: make --prune useful again by accepting an optional parameter 15 February 2009, 08:05:11 UTC
b43174e Junio C Hamano 15 February 2009, 08:03:43 UTC Merge branch 'tr/abbrev-commit-no-ellipses' * tr/abbrev-commit-no-ellipses: log: do not print ellipses with --abbrev-commit 15 February 2009, 08:03:43 UTC
472e474 Junio C Hamano 15 February 2009, 08:03:29 UTC Merge branch 'jc/branch-previous' * jc/branch-previous: Teach @{-1} to git merge Teach the "@{-1} syntax to "git branch" 15 February 2009, 08:03:29 UTC
48c9ab7 SZEDER Gábor 14 February 2009, 16:21:52 UTC bash: fix misspelled 'git svn' option '--user-log-author' -> '--use-log-author' Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 February 2009, 05:31:16 UTC
db7fee8 SZEDER Gábor 14 February 2009, 16:16:29 UTC t1500: more 'git rev-parse --git-dir' tests Extend t1500 with tests of 'git rev-parse --git-dir' when invoked from other directories of the repository or the work tree. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 February 2009, 05:29:50 UTC
8fb3c00 SZEDER Gábor 14 February 2009, 16:16:28 UTC Move 'rev-parse --git-dir' test to t1500 Commit 72183cb2 (Fix gitdir detection when in subdir of gitdir, 2009-01-16) added a test to 't1501-worktree' to check the behaviour of 'git rev-parse --git-dir' in a special case. However, t1501 is about testing separate work tree setups, and not about basic 'rev-parse' functionality, which is tested in t1500-rev-parse. Therefore, this patch moves that test to t1500. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 February 2009, 05:29:46 UTC
d0268de Thomas Rast 14 February 2009, 20:56:51 UTC Documentation: pruning recipe for destructive filter-branch Add a section about how to shrink a repository's size after running git-filter-branch to remove large blobs from history. This comes up every week or so on IRC, and the commands required to handle every case are not very newbie-friendly, so hopefully writing them down somewhere leads to fewer questions. It may seem contradictory to document fallbacks for older Gits in newer docs, but we want to point people at this as a FAQ answer, and they will frequently not have the newest version installed. Thanks to Björn Steinbrink and Junio C Hamano for comments and corrections. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 February 2009, 05:18:54 UTC
58e9d9d Johannes Schindelin 14 February 2009, 22:10:10 UTC gc: make --prune useful again by accepting an optional parameter With this patch, "git gc --no-prune" will not prune any loose (and dangling) object, and "git gc --prune=5.minutes.ago" will prune all loose objects older than 5 minutes. This patch benefitted from suggestions by Thomas Rast and Jan Krï¿œger. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 February 2009, 05:14:07 UTC
c9717ee Junio C Hamano 14 February 2009, 07:26:12 UTC Teach @{-1} to git merge 1.6.2 will have @{-1} syntax advertised as "usable anywhere you can use a branch name". However, "git merge @{-1}" did not work. Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 February 2009, 07:46:42 UTC
8415d5c Junio C Hamano 14 February 2009, 07:08:05 UTC Teach the "@{-1} syntax to "git branch" This teaches the new "@{-1} syntax to refer to the previous branch to "git branch". After looking at somebody's faulty patch series on a topic branch too long, if you decide it is not worth merging, you can just say: $ git checkout master $ git branch -D @{-1} to get rid of it without having to type the name of the topic you now hate so much for wasting a lot of your time. Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 February 2009, 07:46:28 UTC
e9cc02f Jeff King 13 February 2009, 18:26:09 UTC symbolic-ref: allow refs/<whatever> in HEAD Commit afe5d3d5 introduced a safety valve to symbolic-ref to disallow installing an invalid HEAD. It was accompanied by b229d18a, which changed validate_headref to require that HEAD contain a pointer to refs/heads/ instead of just refs/. Therefore, the safety valve also checked for refs/heads/. As it turns out, topgit is using refs/top-bases/ in HEAD, leading us to re-loosen (at least temporarily) the validate_headref check made in b229d18a. This patch does the corresponding loosening for the symbolic-ref safety valve, so that the two are in agreement once more. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 February 2009, 02:20:44 UTC
4b15b4a Keith Cascio 13 February 2009, 17:33:34 UTC Remove redundant bit clears from diff_setup() All bits already clear after memset(0). Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 February 2009, 02:19:37 UTC
7fcda92 Thomas Rast 13 February 2009, 22:10:41 UTC log: do not print ellipses with --abbrev-commit 'git log --abbrev-commit' added an ellipsis to all commit names that were abbreviated. This was particularly annoying if you wanted to cut&paste the sha1 from the terminal, since selecting by word would pick up '...' too. So use find_unique_abbrev() instead of diff_unique_abbrev() in all log-related commit sha1 printing routines, and also change the formatting of the 'Merge: parent1 parent2' line output via pretty_print_commit(). Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 February 2009, 01:18:22 UTC
901d615 Matt Kraai 12 February 2009, 15:55:54 UTC bash-completion: Complete the values of color.interactive, color.ui, color.pager Signed-off-by: Matt Kraai <kraai@ftbfs.org> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 February 2009, 17:55:45 UTC
5cd12b8 Junio C Hamano 12 February 2009, 06:42:27 UTC Install the default "master" branch configuration after cloning a void After "cloning from an empty repository", we have a configuration to describe the remote's URL and the default ref mappings, but we lack the branch configuration for the default branch we create on our end, "master". It is likely that the empty repository we cloned from will point the default "master" branch with its HEAD, so prepare the local configuration to match. Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 February 2009, 06:37:35 UTC
1a526d4 Jeremy White 12 February 2009, 21:17:04 UTC Update documentation to add further information about using Thunderbird with git-imap-send. Signed-off-by: Jeremy White <jwhite@codeweavers.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 February 2009, 01:46:05 UTC
7fe5438 Mark Burton 12 February 2009, 10:21:19 UTC git-rebase.txt: --interactive does not work with --whitespace Signed-off-by: Mark Burton <markb@ordern.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 February 2009, 00:50:28 UTC
49bde75 Jacob Helwig 12 February 2009, 18:01:10 UTC Add 'rm -f' equivalent to 'git rm' example of filter-branch --index-filter Signed-off-by: Jacob Helwig <jacob.helwig@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 February 2009, 23:44:56 UTC
222b167 Junio C Hamano 12 February 2009, 21:02:09 UTC Revert "validate_headref: tighten ref-matching to just branches" This reverts commit b229d18a809c169314b7f0d048dc5a7632e8f916, at least until we figure out how to work better with TopGit that points HEAD to refs/top-bases/ hierarchy. 12 February 2009, 21:02:09 UTC
a8344ab Nazri Ramliy 12 February 2009, 13:36:14 UTC Bugfix: GIT_EXTERNAL_DIFF with more than one changed files When there is more than one file that are changed, running git diff with GIT_EXTERNAL_DIFF incorrectly diagnoses an programming error and dies. The check introduced in 479b0ae (diff: refactor tempfile cleanup handling, 2009-01-22) to detect a temporary file slot that forgot to remove its temporary file was inconsistent with the way the codepath to remove the temporary to mark the slot that it is done with it. This patch fixes this problem and adds a test case for it. Signed-off-by: Nazri Ramliy <ayiehere@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 February 2009, 20:31:52 UTC
30aa4fb Junio C Hamano 12 February 2009, 02:47:30 UTC Merge branch 'maint' * maint: Prepare for 1.6.1.4. Make repack less likely to corrupt repository fast-export: ensure we traverse commits in topological order Clear the delta base cache if a pack is rebuilt Conflicts: RelNotes 12 February 2009, 02:47:30 UTC
e5887c1 Junio C Hamano 12 February 2009, 02:44:03 UTC Prepare for 1.6.1.4. Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 February 2009, 02:44:03 UTC
7a134db Junio C Hamano 12 February 2009, 02:32:37 UTC Merge branch 'maint-1.6.0' into maint * maint-1.6.0: Make repack less likely to corrupt repository fast-export: ensure we traverse commits in topological order Clear the delta base cache if a pack is rebuilt 12 February 2009, 02:32:37 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
0ea29cc Eric Kidd 11 February 2009, 21:10:41 UTC filter-branch: Add more error-handling 9273b56 (filter-branch: Fix fatal error on bare repositories, 2009-02-03) fixed a missing check of return status from an underlying command in git-filter-branch, but there still are places that do not check errors. For example, the command does not pay attention to the exit status of the command given by --commit-filter. It should abort in such a case. This attempts to fix all the remaining places that fails to checks errors. In two places, I've had to break apart pipelines in order to check the error code for the first stage of the pipeline, as discussed here: http://kerneltrap.org/mailarchive/git/2009/1/28/4835614 Feedback on this patch was provided by Johannes Sixt, Johannes Schindelin and Junio C Hamano. Thomas Rast helped with pipeline error handling. Signed-off-by: Eric Kidd <git@randomhacks.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 February 2009, 02:26:52 UTC
e5f5050 Pat Notz 10 February 2009, 16:43:30 UTC Fix contrib/hooks/post-receive-email for new duplicate branch In the show_new_revisions function, the original code: git rev-parse --not --branches | grep -v $(git rev-parse $refname) | isn't quite right since one can create a new branch and push it without any new commits. In that case, two refs will have the same sha1 but both would get filtered by the 'grep'. In the end, we'll show ALL the history which is not what we want. Instead, we should list the branches by name and remove the branch being updated and THEN pass that list through rev-parse. Revised as suggested by Jakub Narebski and Junio C Hamano to use git-for-each-ref instead of git-branch. (Thanks!) Signed-off-by: Pat Notz <pknotz@sandia.gov> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 February 2009, 18:38:53 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
7b73d82 Junio C Hamano 11 February 2009, 18:20:12 UTC Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: test case for regression caused by git-svn empty symlink fix git-svn: fix broken symlink workaround when switching branches git-svn: Print revision while searching for earliest use of path git-svn: abstract out a block into new method other_gs() git-svn: allow disabling expensive broken symlink checks 11 February 2009, 18:20:12 UTC
9e5b80c Junio C Hamano 11 February 2009, 17:22:16 UTC Squelch overzealous "ignoring dangling symref" in an empty repository 057e713 (Warn use of "origin" when remotes/origin/HEAD is dangling, 2009-02-08) tried to warn dangling refs/remotes/origin/HEAD only when "origin" was used to refer to it. There was one corner case a symref is expected to be dangling and this warning is unwarranted: HEAD in an empty repository. This squelches the warning for this special case. Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 February 2009, 17:22:16 UTC
39111f6 Anton Gyllenberg 10 February 2009, 22:38:45 UTC test case for regression caused by git-svn empty symlink fix Commit dbc6c74d0858d77e61e092a48d467e725211f8e9 "git-svn: handle empty files marked as symlinks in SVN" caused a regression in an unusual case where a branch has been created in SVN, later deleted and then created again from another branch point and the original branch point had empty files not in the new branch. In some cases git svn fetch will then fail while trying to fetch the empty file from the wrong SVN revision. This adds a test case that reproduces the issue. [ew: added additional test to ensure file was created correctly made test file executable ] Signed-off-by: Anton Gyllenberg <anton@iki.fi> Acked-by: Eric Wong <normalperson@yhbt.net> 11 February 2009, 10:02:04 UTC
8841b37 Eric Wong 11 February 2009, 09:56:58 UTC git-svn: fix broken symlink workaround when switching branches Thanks to Anton Gyllenberg <anton@iki.fi> for the bug report (and testcase in the following commit): > Commit dbc6c74d0858d77e61e092a48d467e725211f8e9 "git-svn: > handle empty files marked as symlinks in SVN" caused a > regression in an unusual case where a branch has been created > in SVN, later deleted and then created again from another > branch point and the original branch point had empty files not > in the new branch. In some cases git svn fetch will then fail > while trying to fetch the empty file from the wrong SVN > revision. Signed-off-by: Eric Wong <normalperson@yhbt.net> 11 February 2009, 10:02:04 UTC
9936656 Deskin Miller 09 February 2009, 00:33:18 UTC git-svn: Print revision while searching for earliest use of path When initializing a git-svn repository from a Subversion repoository, it is common to be interested in a path which did not exist in the initial commit to Subversion. In a large repository, the initial fetch may take some looking for the earliest existence of the path time while the user receives no additional feedback. Print the highest revision number scanned thus far to let the user know something is still happening. Signed-off-by: Deskin Miller <deskinm@umich.edu> 11 February 2009, 10:00:42 UTC
8e3f9b1 Sam Vilain 26 June 2007, 07:23:59 UTC git-svn: abstract out a block into new method other_gs() We will be adding a more places that need to find git revisions corresponding to new parents, so abstract out this section into a new method. Signed-off-by: Yuval Kogman <nothingmuch@woobling.org> Signed-off-by: Sam Vilain <sam@vilain.net> Acked-by: Eric Wong <normalperson@yhbt.net> [ew: minor formatting changes] 11 February 2009, 10:00:42 UTC
4c58a71 Eric Wong 01 February 2009, 01:31:12 UTC git-svn: allow disabling expensive broken symlink checks Since dbc6c74d0858d77e61e092a48d467e725211f8e9, git-svn has had an expensive check for broken symlinks that exist in some repositories. This leads to a heavy performance hit on repositories with many empty blobs that are not supposed to be symlinks. The workaround is enabled by default; and may be disabled via: git config svn.brokenSymlinkWorkaround false Reported by Markus Heidelberg. Signed-off-by: Eric Wong <normalperson@yhbt.net> 11 February 2009, 10:00:42 UTC
aff4e8d Junio C Hamano 11 February 2009, 10:00:22 UTC Merge branch 'maint' * maint: revision traversal and pack: notice and die on missing commit 11 February 2009, 10:00:22 UTC
268c015 Junio C Hamano 11 February 2009, 10:00:07 UTC Merge branch 'maint-1.5.6' into maint * maint-1.5.6: revision traversal and pack: notice and die on missing commit 11 February 2009, 10:00:07 UTC
afce435 Junio C Hamano 11 February 2009, 09:41:22 UTC Merge branch 'maint-1.5.5' into maint-1.5.6 * maint-1.5.5: revision traversal and pack: notice and die on missing commit Conflicts: revision.c 11 February 2009, 09:41:22 UTC
9279870 Junio C Hamano 11 February 2009, 09:40:12 UTC Merge branch 'maint-1.5.4' into maint-1.5.5 * maint-1.5.4: revision traversal and pack: notice and die on missing commit 11 February 2009, 09:40:12 UTC
ed62089 Junio C Hamano 11 February 2009, 09:27:43 UTC revision traversal and pack: notice and die on missing commit cc0e6c5 (Handle return code of parse_commit in revision machinery, 2007-05-04) attempted to tighten error checking in the revision machinery, but it wasn't enough. When get_revision_1() was asked for the next commit to return, it tries to read and simplify the parents of the commit to be returned, but an error while doing so was silently ignored and reported as a truncated history to the caller instead. This resulted in an early end of "git log" output or a pack that lacks older commits from "git pack-objects", without any error indication in the exit status from these commands, even though the underlying parse_commit() issues an error message to the end user. Note that the codepath in add_parents_list() that paints parents of an UNINTERESTING commit UNINTERESTING silently ignores the error when parse_commit() fails; this is deliberate and in line with aeeae1b (revision traversal: allow UNINTERESTING objects to be missing, 2009-01-27). Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 February 2009, 09:29:52 UTC
1b53a07 Junio C Hamano 09 February 2009, 06:19:43 UTC builtin-receive-pack.c: do not initialize statics to 0 Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 February 2009, 06:27:14 UTC
747ca24 Junio C Hamano 09 February 2009, 06:31:21 UTC receive-pack: receive.denyDeleteCurrent This is a companion patch to the recent 3d95d92 (receive-pack: explain what to do when push updates the current branch, 2009-01-31). Deleting the current branch from a remote will result in the next clone from it not check out anything, among other things. It also is one of the cause that makes remotes/origin/HEAD a dangling symbolic ref. This patch still allows the traditional behaviour but with a big warning, and promises that the default will change to 'refuse' in a future release. Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 February 2009, 06:26:49 UTC
ba19a80 Junio C Hamano 11 February 2009, 01:42:04 UTC Drop double-semicolon in C The worst offenders are "continue;;" and "break;;" in switch statements. Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 February 2009, 06:26:37 UTC
057e713 Junio C Hamano 09 February 2009, 07:52:01 UTC Warn use of "origin" when remotes/origin/HEAD is dangling The previous one squelched the diagnositic message we used to issue every time we enumerated the refs and noticed a dangling ref. This adds the warning back to the place where the user actually attempts to use it. Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 February 2009, 06:26:32 UTC
f8948e2 Junio C Hamano 09 February 2009, 07:27:10 UTC remote prune: warn dangling symrefs If you prune from the remote "frotz" that deleted the ref your tracking branch remotes/frotz/HEAD points at, the symbolic ref will become dangling. We used to detect this as an error condition and issued a message every time refs are enumerated. This stops the error message, but moves the warning to "remote prune". Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 February 2009, 06:26:20 UTC
back to top