| 038e2e5 | Alex Riesen | 07 June 2011, 09:49:44 UTC | t3703: skip more tests using colons in file names on Windows Use the same test and prerequisite as introduced in similar fix in 650af7ae8bdf92bd92df2. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 June 2011, 15:32:14 UTC |
| 488201c | Ramsay Jones | 17 May 2011, 17:43:10 UTC | setup.c: Fix some "symbol not declared" sparse warnings In particular, sparse issues the "symbol 'a_symbol' was not declared. Should it be static?" warnings for the following symbols: setup.c:159:3: 'pathspec_magic' setup.c:176:12: 'prefix_pathspec' These symbols only require file scope, so we add the static modifier to their declarations. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 May 2011, 04:04:59 UTC |
| 650af7a | Johannes Sixt | 12 May 2011, 08:21:33 UTC | t3703: Skip tests using directory name ":" on Windows ":" is not allowed in file names on Windows. Detect this case and skip a test if necessary. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 May 2011, 05:32:24 UTC |
| 93e7d67 | Junio C Hamano | 11 May 2011, 22:23:25 UTC | revision.c: leave a note for "a lone :" enhancement If we later add a command in the log family that by default limit its operation to the current subdirectory, we would need to resurrect the "a lone ':' on the command line means no pathspec whatsoever". Now the codepath was cleaned up, we can do so in one place. Leave a note to mark where it is for later generations. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 May 2011, 22:23:25 UTC |
| 25197eb | Junio C Hamano | 11 May 2011, 22:14:13 UTC | Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' * jc/maint-1.6.6-pathspec-stdin-and-cmdline: setup_revisions(): take pathspec from command line and --stdin correctly | 11 May 2011, 22:14:13 UTC |
| 4da5af3 | Junio C Hamano | 11 May 2011, 21:01:19 UTC | setup_revisions(): take pathspec from command line and --stdin correctly When the command line has "--" disambiguator, we take the remainder of argv[] as "prune_data", but when --stdin is given at the same time, we need to append to the existing prune_data and end up attempting to realloc(3) it. That would not work. Fix it by consistently using append_prune_data() throughout the input processing. Also avoid counting the number of existing paths in the function over and over again. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 May 2011, 21:43:56 UTC |
| 6fd09f5 | Nguyễn Thái Ngọc Duy | 08 May 2011, 11:08:26 UTC | t3703, t4208: add test cases for magic pathspec Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 May 2011, 19:42:59 UTC |
| 0e539dc | Junio C Hamano | 10 May 2011, 19:05:01 UTC | rev/path disambiguation: further restrict "misspelled index entry" diag A colon followed by anything !isalnum() (e.g. ":/heh") at this point is known not to be an existing rev. Just give a generic "neither a rev nor a path" error message. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 May 2011, 19:38:06 UTC |
| 2e83b66 | Junio C Hamano | 10 May 2011, 19:02:54 UTC | fix overslow :/no-such-string-ever-existed diagnostics "git cmd :/no-such-string-ever-existed" runs an extra round of get_sha1() since 009fee4 (Detailed diagnosis when parsing an object name fails., 2009-12-07). Once without error diagnosis to see there is no commit with such a string in the log message (hence "it cannot be a ref"), and after seeing that :/no-such-string-ever-existed is not a filename (hence "it cannot be a path, either"), another time to give "better diagnosis". The thing is, the second time it runs, we already know that traversing the history all the way down to the root will _not_ find any matching commit. Rename misguided "gently" parameter, which is turned off _only_ when the "detailed diagnosis" codepath knows that it cannot be a ref and making the call only for the caller to die with a message. Flip its meaning (and adjust the callers) and call it "only_to_die", which is not a great name, but it describes far more clearly what the codepaths that switches their behaviour based on this variable do. On my box, the command spends ~1.8 seconds without the patch to make the report; with the patch it spends ~1.12 seconds. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 May 2011, 19:37:54 UTC |
| 9619617 | Junio C Hamano | 10 May 2011, 18:10:30 UTC | fix overstrict :<path> diagnosis Given "git log :", we get a disambiguation message that tries to be helpful and yet totally misses the point, i.e. $ git log : fatal: Path '' does not exist (neither on disk nor in the index). $ git log :/ fatal: Path '/' exists on disk, but not in the index. An empty path nor anything that begins with '/' cannot possibly in the index, and it is wrong to guess that the user might have meant to access such an index entry. It should yield the same error message as "git log '*.c'", i.e. $ git log '*.c' fatal: ambiguous argument '*.c': unknown revision or path not in the working tree. Use '--' to separate paths from revisions Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 May 2011, 19:36:06 UTC |
| 7c5f3cc | Junio C Hamano | 10 May 2011, 04:34:04 UTC | grep: use get_pathspec() correctly When there is no remaining string in argv, get_pathspec(prefix, argv) will return a two-element array that has prefix as the first element, so there is no need to re-roll that logic in the code that uses get_pathspec(). Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 May 2011, 19:11:01 UTC |
| b060ce7 | Junio C Hamano | 10 May 2011, 19:07:12 UTC | pathspec: drop "lone : means no pathspec" from get_pathspec() We may want to give the pathspec subsystem such a feature, but not while we are still using get_pathspec() that returns a stupid "char **" that loses subtle nuances that existed in the input string. In the meantime, the callers of get_pathspec() that want to support it could do an equivalent before feeding their argv[] to the function themselves quite easily. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 May 2011, 19:07:12 UTC |
| 6d94292 | Junio C Hamano | 10 May 2011, 17:23:41 UTC | Revert "magic pathspec: add ":(icase)path" to match case insensitively" This reverts commit d0546e2d488b1ba185c430b638619ab1d91af509, which was only meant to be a Proof-of-concept used during the discussion. The real implementation of the feature needs to wait until we migrate all the code to use "struct pathspec", not "char **", to represent richer semantics given to pathspec. | 10 May 2011, 17:23:41 UTC |
| d0546e2 | Junio C Hamano | 07 April 2011, 03:56:19 UTC | magic pathspec: add ":(icase)path" to match case insensitively Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2011, 23:20:16 UTC |
| 2f6c976 | Junio C Hamano | 08 April 2011, 23:18:46 UTC | magic pathspec: futureproof shorthand form The earlier design was to take whatever non-alnum that the short format parser happens to support, leaving the rest as part of the pattern, so a version of git that knows '*' magic and a version that does not would have behaved differently when given ":*Makefile". The former would have applied the '*' magic to the pattern "Makefile", while the latter would used no magic to the pattern "*Makefile". Instead, just reserve all non-alnum ASCII letters that are neither glob nor regexp special as potential magic signature, and when we see a magic that is not supported, die with an error message, just like the longhand codepath does. With this, ":%#!*Makefile" will always mean "%#!" magic applied to the pattern "*Makefile", no matter what version of git is used (it is a different matter if the version of git supports all of these three magic matching rules). Also make ':' without anything else to mean "there is no pathspec". This would allow differences between "git log" and "git log ." run from the top level of the working tree (the latter simplifies no-op commits away from the history) to be expressed from a subdirectory by saying "git log :". Helped-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2011, 23:19:48 UTC |
| 8a42c98 | Junio C Hamano | 06 April 2011, 23:11:56 UTC | magic pathspec: add tentative ":/path/from/top/level" pathspec support Support ":/" magic string that can be prefixed to a pathspec element to say "this names the path from the top-level of the working tree", when you are in the subdirectory. For example, you should be able to say: $ edit Makefile ;# top-level $ cd Documentation $ edit git.txt ;# in the subdirectory and then do one of three things, still inside the subdirectory: $ git add -u . ;# add only Documentation/git.txt $ git add -u :/ ;# add everything, including paths outside Documentation $ git add -u ;# whatever the default setting is. To truly support magic pathspec, the API needs to be restructured so that get_pathspec() and init_pathspec() are unified into one call. Currently, the former just prefixes the user supplied pathspec with the current subdirectory path, and the latter takes the output from the former and pre-parses them into a bit richer structure for easier handling. They should become a single API function that takes the current subdirectory path and the remainder of argv[] (after parsing --options and revision arguments from the command line) and returns an array of parsed pathspec elements, and "magic" should become attributes of struct pathspec_item. This patch implements only "top" magic because it can be hacked into the system without such a refactoring. The syntax for magic pathspec prefix is designed to be extensible yet simple to type to invoke a simple magic like "from the top". The parser for the magic prefix is hooked into get_pathspec() function in this patch, and it needs to be moved when we refactor the API. But we have to start from somewhere. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 April 2011, 00:08:46 UTC |
| a91df69 | Junio C Hamano | 20 March 2011, 06:25:38 UTC | Merge branch 'mm/maint-log-n-with-diff-filtering' * mm/maint-log-n-with-diff-filtering: log: fix --max-count when used together with -S or -G | 20 March 2011, 06:25:38 UTC |
| 06a0540 | Junio C Hamano | 20 March 2011, 06:25:32 UTC | Merge branch 'mg/rev-list-n-reverse-doc' * mg/rev-list-n-reverse-doc: git-log.txt,rev-list-options.txt: put option blocks in proper order git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting | 20 March 2011, 06:25:32 UTC |
| bcd5461 | Junio C Hamano | 20 March 2011, 06:24:48 UTC | Merge branch 'js/rerere-forget-always-take-pathspec' * js/rerere-forget-always-take-pathspec: rerere forget: deprecate invocation without pathspec | 20 March 2011, 06:24:48 UTC |
| 1e23907 | Junio C Hamano | 20 March 2011, 06:24:42 UTC | Merge branch 'ab/i18n-basic' * ab/i18n-basic: i18n: "make distclean" should clean up after "make pot" i18n: Makefile: "pot" target to extract messages marked for translation i18n: add stub Q_() wrapper for ngettext i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set i18n: add GETTEXT_POISON to simulate unfriendly translator i18n: add no-op _() and N_() wrappers commit, status: use status_printf{,_ln,_more} helpers commit: refer to commit template as s->fp wt-status: add helpers for printing wt-status lines Conflicts: builtin/commit.c | 20 March 2011, 06:24:42 UTC |
| 32b31ab | Junio C Hamano | 20 March 2011, 06:24:34 UTC | Merge branch 'uk/ls-remote-in-get-remote-url' * uk/ls-remote-in-get-remote-url: git-request-pull: open-code the only invocation of get_remote_url get_remote_url(): use the same data source as ls-remote to get remote urls | 20 March 2011, 06:24:34 UTC |
| 9d59e66 | Junio C Hamano | 20 March 2011, 06:24:27 UTC | Merge branch 'ss/mergetool--lib' * ss/mergetool--lib: mergetool--lib: Add Beyond Compare 3 as a tool mergetool--lib: Sort tools alphabetically for easier lookup | 20 March 2011, 06:24:27 UTC |
| f4784b3 | Junio C Hamano | 20 March 2011, 06:24:19 UTC | Merge branch 'jn/status-translatable' * jn/status-translatable: commit, status: use status_printf{,_ln,_more} helpers commit: refer to commit template as s->fp wt-status: add helpers for printing wt-status lines Conflicts: builtin/commit.c | 20 March 2011, 06:24:19 UTC |
| 0d7f242 | Junio C Hamano | 20 March 2011, 06:24:12 UTC | Merge branch 'jk/trace-sifter' * jk/trace-sifter: trace: give repo_setup trace its own key add packet tracing debug code trace: add trace_strbuf trace: factor out "do we want to trace" logic trace: refactor to support multiple env variables trace: add trace_vprintf | 20 March 2011, 06:24:12 UTC |
| dc7f96f | Junio C Hamano | 20 March 2011, 06:24:08 UTC | Merge branch 'jk/format-patch-multiline-header' * jk/format-patch-multiline-header: format-patch: rfc2047-encode newlines in headers format-patch: wrap long header lines strbuf: add fixed-length version of add_wrapped_text | 20 March 2011, 06:24:08 UTC |
| 0ce6a51 | Junio C Hamano | 20 March 2011, 06:23:56 UTC | Merge branch 'jk/merge-rename-ux' * jk/merge-rename-ux: pull: propagate --progress to merge merge: enable progress reporting for rename detection add inexact rename detection progress infrastructure commit: stop setting rename limit bump rename limit defaults (again) merge: improve inexact rename limit warning | 20 March 2011, 06:23:56 UTC |
| edf9d71 | Junio C Hamano | 20 March 2011, 06:21:10 UTC | Merge branch 'maint' * maint: gitweb: Always call parse_date with timezone parameter bisect: explain the rationale behind 125 | 20 March 2011, 06:21:10 UTC |
| c41dd2f | René Scharfe | 19 March 2011, 18:33:15 UTC | grep: read patterns from stdin with -f - Support the well-know convention of reading standard input instead of a named file if "-" (dash) is specified. GNU grep does the same. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2011, 04:46:52 UTC |
| 6368d9f | Jakub Narebski | 19 March 2011, 22:53:55 UTC | gitweb: Always call parse_date with timezone parameter Timezone is required to correctly set local time, which would be needed for future 'localtime' feature. While at it, remove unnecessary call to the function from git_log_body, as its return value is not used anywhere. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2011, 04:46:32 UTC |
| 958bf6b | Junio C Hamano | 20 March 2011, 04:46:06 UTC | bisect: explain the rationale behind 125 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2011, 04:46:24 UTC |
| af4c62a | Junio C Hamano | 18 March 2011, 23:20:49 UTC | Merge branch 'maint' * maint: docs: fix grammar in gitattributes.txt | 18 March 2011, 23:20:49 UTC |
| b547ce0 | Alexei Sholik | 18 March 2011, 13:14:27 UTC | docs: fix grammar in gitattributes.txt [jc: with a fixlet from Marc Branchaud] Signed-off-by: Alexei Sholik <alcosholik@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 March 2011, 16:58:47 UTC |
| e2a57aa | Carlos Martín Nieto | 17 March 2011, 11:26:46 UTC | Name make_*_path functions more accurately Rename the make_*_path functions so it's clearer what they do, in particlar make clear what the differnce between make_absolute_path and make_nonrelative_path is by renaming them real_path and absolute_path respectively. make_relative_path has an understandable name and is renamed to relative_path to maintain the name convention. The function calls have been replaced 1-to-1 in their usage. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2011, 23:08:30 UTC |
| a3ca9b0 | Michael J Gruber | 16 March 2011, 09:23:23 UTC | RelNotes/1.7.5.txt: typo and language fixes Also remove entries for fixes that are already present in the maintenance track. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2011, 00:02:58 UTC |
| b2f6eab | Junio C Hamano | 16 March 2011, 23:59:30 UTC | Merge branch 'maint' * maint: Prepare draft release notes to 1.7.4.2 gitweb: highlight: replace tabs with spaces make_absolute_path: return the input path if it points to our buffer valgrind: ignore SSE-based strlen invalid reads diff --submodule: split into bite-sized pieces cherry: split off function to print output lines branch: split off function that writes tracking info and commit subject standardize brace placement in struct definitions compat: make gcc bswap an inline function enums: omit trailing comma for portability Conflicts: RelNotes | 16 March 2011, 23:59:30 UTC |
| fbcda3c | Junio C Hamano | 16 March 2011, 23:29:03 UTC | Prepare draft release notes to 1.7.4.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 23:47:40 UTC |
| afb497d | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'jn/maint-commit-missing-template' into maint * jn/maint-commit-missing-template: commit: error out for missing commit message template | 16 March 2011, 23:47:26 UTC |
| 43c1b6e | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'lt/rename-no-extra-copy-detection' into maint * lt/rename-no-extra-copy-detection: diffcore-rename: improve estimate_similarity() heuristics diffcore-rename: properly honor the difference between -M and -C for_each_hash: allow passing a 'void *data' pointer to callback | 16 March 2011, 23:47:26 UTC |
| 4e530c5 | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'jk/diffstat-binary' into maint * jk/diffstat-binary: diff: don't retrieve binary blobs for diffstat diff: handle diffstat of rewritten binary files | 16 March 2011, 23:47:26 UTC |
| 13a39e2 | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'mg/maint-difftool-vim-readonly' into maint * mg/maint-difftool-vim-readonly: mergetool-lib: call vim in readonly mode for diffs | 16 March 2011, 23:47:26 UTC |
| c9b7cc0 | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'jn/test-terminal-punt-on-osx-breakage' into maint * jn/test-terminal-punt-on-osx-breakage: tests: skip terminal output tests on OS X | 16 March 2011, 23:47:26 UTC |
| 8209b7f | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'jk/fail-null-clone' into maint * jk/fail-null-clone: clone: die when trying to clone missing local path | 16 March 2011, 23:47:26 UTC |
| 61a6f1f | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'jh/push-default-upstream-configname' into maint * jh/push-default-upstream-configname: push.default: Rename 'tracking' to 'upstream' | 16 March 2011, 23:47:26 UTC |
| 7633a5a | Junio C Hamano | 16 March 2011, 23:47:25 UTC | Merge branch 'mg/placeholders-are-lowercase' into maint * mg/placeholders-are-lowercase: Make <identifier> lowercase in Documentation Make <identifier> lowercase as per CodingGuidelines Make <identifier> lowercase as per CodingGuidelines Make <identifier> lowercase as per CodingGuidelines CodingGuidelines: downcase placeholders in usage messages | 16 March 2011, 23:47:25 UTC |
| bd2700d | Junio C Hamano | 16 March 2011, 23:47:25 UTC | Merge branch 'mg/patch-id' into maint * mg/patch-id: git-patch-id: do not trip over "no newline" markers git-patch-id: test for "no newline" markers | 16 March 2011, 23:47:25 UTC |
| 5b8aac3 | Junio C Hamano | 16 March 2011, 23:47:25 UTC | Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maint * js/maint-merge-use-prepare-commit-msg-hook: merge: honor prepare-commit-msg hook | 16 March 2011, 23:47:25 UTC |
| 6affdbe | Kevin Cernekee | 16 March 2011, 22:34:13 UTC | gitweb: highlight: replace tabs with spaces Consider the following code fragment: /* * test */ vim ":set list" mode shows that the first character on each line is a tab: ^I/*$ ^I * test$ ^I */$ By default, the "highlight" program will retain the tabs in the HTML output: $ highlight --fragment --syntax c test.c <span class="hl com">/*</span> <span class="hl com"> * test</span> <span class="hl com"> */</span> vim list mode: ^I<span class="hl com">/*</span>$ <span class="hl com">^I * test</span>$ <span class="hl com">^I */</span>$ In gitweb, this winds up looking something like: 1 /* 2 * test 3 */ I tried both Firefox and Opera and saw the same behavior. The desired output is: 1 /* 2 * test 3 */ This can be accomplished by specifying "--replace-tabs=8" on the highlight command line. Signed-off-by: Kevin Cernekee <cernekee@gmail.com> Acked-by: John 'Warthog9' Hawley <warthog9@eaglescrag.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 23:18:58 UTC |
| 1d679de | Carlos Martín Nieto | 16 March 2011, 16:06:17 UTC | make_absolute_path: return the input path if it points to our buffer Some codepaths call make_absolute_path with its own return value as input. In such a cases, return the path immediately. This fixes a valgrind-discovered error, whereby we tried to copy a string onto itself. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 20:51:22 UTC |
| b406a2d | Carlos Martín Nieto | 16 March 2011, 11:46:01 UTC | valgrind: ignore SSE-based strlen invalid reads Some versions of strlen use SSE to speed up the calculation and load 4 bytes at a time, even if it means reading past the end of the allocated memory. This read is safe and when the strlen function is inlined, it is not replaced by valgrind, which reports a false-possitive. Tell valgrind to ignore this particular error, as the read is, in fact, safe. Current upstream-released version 3.6.1 is affected. Some distributions have this fixed in their latest versions. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 20:19:56 UTC |
| 0631623 | Jonathan Nieder | 16 March 2011, 07:02:42 UTC | vcs-svn: remove spurious semicolons trp_gen is not a statement or function call, so it should not be followed with a semicolon. Noticed by gcc -pedantic. vcs-svn/repo_tree.c:41:81: warning: ISO C does not allow extra ';' outside of a function [-pedantic] Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:56:23 UTC |
| 808a95d | Jonathan Nieder | 16 March 2011, 07:14:11 UTC | diff --submodule: split into bite-sized pieces Introduce two functions: - prepare_submodule_summary prepares the revision walker to list changes in a submodule. That is, it: * finds merge bases between the commits pointed to this path from before ("left") and after ("right") the change; * checks whether this is a fast-forward or fast-backward; * prepares a revision walk to list commits in the symmetric difference between the commits at each endpoint. It returns nonzero on error. - print_submodule_summary runs the revision walk and saves the result to a strbuf in --left-right format. The goal is just readability. No functional change intended. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:55:49 UTC |
| a3a32e7 | Jonathan Nieder | 16 March 2011, 07:12:48 UTC | cherry: split off function to print output lines Readers uninterested in the details of "git cherry"'s output format can see print_commit('-', commit, verbose, abbrev); and ignore the details. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:54:44 UTC |
| 6e0332e | Jonathan Nieder | 16 March 2011, 07:10:14 UTC | branch: split off function that writes tracking info and commit subject Introduce a add_verbose_info function that takes care of adding - an abbreviated object name; - a summary of the form [ahead x, behind y] of the relationship to the corresponding upstream branch; - a one line commit subject for the tip commit of a branch, for use in "git branch -v" output. No functional change intended. This just unindents the code a little and makes it easier to skip on first reading. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:52:15 UTC |
| 9cba13c | Jonathan Nieder | 16 March 2011, 07:08:34 UTC | standardize brace placement in struct definitions In a struct definitions, unlike functions, the prevailing style is for the opening brace to go on the same line as the struct name, like so: struct foo { int bar; char *baz; }; Indeed, grepping for 'struct [a-z_]* {$' yields about 5 times as many matches as 'struct [a-z_]*$'. Linus sayeth: Heretic people all over the world have claimed that this inconsistency is ... well ... inconsistent, but all right-thinking people know that (a) K&R are _right_ and (b) K&R are right. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:49:02 UTC |
| c6c8d0b | Jonathan Nieder | 16 March 2011, 07:00:49 UTC | compat: make gcc bswap an inline function Without this change, gcc -pedantic warns: cache.h: In function 'ce_to_dtype': cache.h:270:21: warning: ISO C forbids braced-groups within expressions [-pedantic] An inline function is more readable anyway. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:44:59 UTC |
| c9b6782 | Jonathan Nieder | 16 March 2011, 06:59:10 UTC | enums: omit trailing comma for portability Since v1.7.2-rc0~23^2~2 (Add per-repository eol normalization, 2010-05-19), building with gcc -std=gnu89 -pedantic produces warnings like the following: convert.c:21:11: warning: comma at end of enumerator list [-pedantic] gcc is right to complain --- these commas are not permitted in C89. In the spirit of v1.7.2-rc0~32^2~16 (2010-05-14), remove them. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:31:32 UTC |
| 276e017 | Junio C Hamano | 16 March 2011, 07:17:05 UTC | Merge branch 'nd/struct-pathspec' * nd/struct-pathspec: declare 1-bit bitfields to be unsigned | 16 March 2011, 07:17:05 UTC |
| 9ddf172 | Jonathan Nieder | 16 March 2011, 03:42:32 UTC | declare 1-bit bitfields to be unsigned As "gcc -pedantic" notices, a two's complement 1-bit signed integer cannot represent the value '1'. dir.c: In function 'init_pathspec': dir.c:1291:4: warning: overflow in implicit constant conversion [-Woverflow] In the spirit of v1.7.1-rc1~10 (2010-04-06), 'unsigned' is what was intended, so let's make the flags unsigned. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 05:24:29 UTC |
| a62eafb | Junio C Hamano | 15 March 2011, 22:17:54 UTC | Update draft release notes to 1.7.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 March 2011, 22:17:54 UTC |
| d0ef5a7 | Junio C Hamano | 15 March 2011, 21:23:04 UTC | Merge branch 'jk/strbuf-vaddf' * jk/strbuf-vaddf: compat: fall back on __va_copy if available strbuf: add strbuf_vaddf compat: provide a fallback va_copy definition | 15 March 2011, 21:23:04 UTC |
| bde7f73 | Junio C Hamano | 15 March 2011, 21:22:55 UTC | Merge branch 'mm/push-default-advice' * mm/push-default-advice: push: better error message when no remote configured push: better error messages when push.default = tracking | 15 March 2011, 21:22:55 UTC |
| e2bbfed | Junio C Hamano | 15 March 2011, 21:22:37 UTC | Merge branch 'jn/maint-instaweb-plack-fix' * jn/maint-instaweb-plack-fix: git-instaweb: Change how gitweb.psgi is made runnable as standalone app | 15 March 2011, 21:22:37 UTC |
| 674ef90 | Junio C Hamano | 15 March 2011, 21:22:23 UTC | Merge branch 'sp/maint-fd-limit' * sp/maint-fd-limit: sha1_file.c: Don't retain open fds on small packs mingw: add minimum getrlimit() compatibility stub Limit file descriptors used by packs | 15 March 2011, 21:22:23 UTC |
| ccf6d62 | Junio C Hamano | 15 March 2011, 21:22:16 UTC | Merge branch 'jc/checkout-orphan-warning' * jc/checkout-orphan-warning: commit: give final warning when reattaching HEAD to leave commits behind | 15 March 2011, 21:22:16 UTC |
| 663ee1a | Junio C Hamano | 15 March 2011, 21:22:13 UTC | Merge branch 'jh/maint-do-not-track-non-branches' * jh/maint-do-not-track-non-branches: branch/checkout --track: Ensure that upstream branch is indeed a branch | 15 March 2011, 21:22:13 UTC |
| 936dfc2 | Junio C Hamano | 15 March 2011, 21:22:09 UTC | Merge branch 'fk/maint-cvsimport-early-failure' * fk/maint-cvsimport-early-failure: git-cvsimport.perl: Bail out right away when reading from the server fails | 15 March 2011, 21:22:09 UTC |
| 8506588 | Junio C Hamano | 15 March 2011, 21:22:02 UTC | Merge branch 'jc/maint-apply-report-offset' * jc/maint-apply-report-offset: apply -v: show offset count when patch did not apply exactly | 15 March 2011, 21:22:02 UTC |
| af2b184 | Junio C Hamano | 15 March 2011, 21:22:00 UTC | Merge branch 'jc/maint-apply-no-double-patch' * jc/maint-apply-no-double-patch: apply: do not patch lines that were already patched | 15 March 2011, 21:22:00 UTC |
| 848e219 | Junio C Hamano | 15 March 2011, 21:21:47 UTC | Merge branch 'mr/hpux' * mr/hpux: git-compat-util.h: Honor HP C's noreturn attribute Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section | 15 March 2011, 21:21:47 UTC |
| 0986de9 | Piotr Krukowiecki | 15 March 2011, 19:58:14 UTC | Documentation: running test with --debug keeps "trash" directory Signed-off-by: Piotr Krukowiecki <piotr.krukowiecki@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 March 2011, 21:18:34 UTC |
| 1d5742c | Junio C Hamano | 15 March 2011, 20:32:09 UTC | Merge branch 'jk/doc-credits' of git://github.com/peff/git * 'jk/doc-credits' of git://github.com/peff/git: docs: point git.txt author credits to git-scm.com doc: add missing git footers doc: drop author/documentation sections from most pages | 15 March 2011, 20:32:09 UTC |
| a35138a | Junio C Hamano | 14 March 2011, 18:59:10 UTC | Merge branch 'sp/maint-smart-http-sans-100-continue' * sp/maint-smart-http-sans-100-continue: smart-http: Really never use Expect: 100-continue | 14 March 2011, 18:59:10 UTC |
| 959dfcf | Shawn O. Pearce | 14 March 2011, 18:28:17 UTC | smart-http: Really never use Expect: 100-continue libcurl may choose to try and use Expect: 100-continue for any type of POST, not just a Transfer: chunked-encoding type. Force it to disable this feature, as not all proxy servers support 100-continue and leaving it enabled can cause 1 second stalls during the negotiation phase of fetch-pack/upload-pack. In ("206b099d26 smart-http: Don't use Expect: 100-Continue") we tried to disable this for only large POST bodies, but it should be disabled for every POST body. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2011, 18:58:51 UTC |
| ee55703 | Drew Northup | 14 March 2011, 15:47:37 UTC | Documentation: "rebase <onto> <that>" stays on <that> branch upon exit This change makes it clearer that the change to the history effected by executing 'git rebase master' while on 'topic' branch, and by executing 'git rebase master topic' on any branch, will be the same; the implicit checkout of the second form will remain after the rebase exits. Signed-off-by: Drew Northup <drew.northup@maine.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2011, 17:52:23 UTC |
| 0564d93 | Jakob Pfender | 14 March 2011, 16:23:52 UTC | object.h: Remove obsolete struct object_refs 7914053 (Remove unused object-ref code, 2008-02-25) removed all uses of the structure from the code, but forgot to remove the type definition itself. Signed-off-by: Jakob Pfender <jpfender@elegosoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2011, 17:49:28 UTC |
| ae4479d | Junio C Hamano | 13 March 2011, 08:10:06 UTC | Merge branch 'pw/p4' * pw/p4: git-p4: test clone @all git-p4: fix clone @all regression | 13 March 2011, 08:10:06 UTC |
| f0c9fe0 | Pete Wyckoff | 12 March 2011, 16:24:49 UTC | git-p4: test clone @all Cloning a p4 depot by default generates a single commit. The use of the "@all" revision specifier instead tells git-p4 to import all commits. Check to make sure both these invocations work as expected. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 March 2011, 08:06:25 UTC |
| ac34efc | Pete Wyckoff | 12 March 2011, 16:23:23 UTC | git-p4: fix clone @all regression e32e00d (git-p4: better message for "git-p4 sync" when not cloned, 2011-02-19) broke the use of the "@all" revision specifier, e.g., git-p4 clone //depot/xxx@all Fix it as per Tor Arvid's quick patch. Signed-off-by: Pete Wyckoff <pw@padd.com> Reported-by: Anatol Pomozov <anatol.pomozov@gmail.com> Based-on-patch-by: Tor Arvid Lund <torarvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 March 2011, 08:06:25 UTC |
| d8f708f | Jeff King | 13 March 2011, 03:00:38 UTC | docs: point git.txt author credits to git-scm.com There is a nice shortlog-ish output of the authors there. We also point people directly to shortlog, but of course they might be reading the documentation online or from a binary package of git. | 13 March 2011, 03:00:38 UTC |
| 6ea922d | Jeff King | 11 March 2011, 06:08:48 UTC | doc: add missing git footers Almost every page has a footer that links back to the main git(1) page. Let's add it on the few that are missing it. | 11 March 2011, 15:59:16 UTC |
| 48bb914 | Jeff King | 11 March 2011, 05:52:08 UTC | doc: drop author/documentation sections from most pages The point of these sections is generally to: 1. Give credit where it is due. 2. Give the reader an idea of where to ask questions or file bug reports. But they don't do a good job of either case. For (1), they are out of date and incomplete. A much more accurate answer can be gotten through shortlog or blame. For (2), the correct contact point is generally git@vger, and even if you wanted to cc the contact point, the out-of-date and incomplete fields mean you're likely sending to somebody useless. So let's drop the fields entirely from all manpages except git(1) itself. We already point people to the mailing list for bug reports there, and we can update the Authors section to give credit to the major contributors and point to shortlog and blame for more information. Each page has a "This is part of git" footer, so people can follow that to the main git manpage. | 11 March 2011, 15:59:16 UTC |
| adfe4e1 | Junio C Hamano | 11 March 2011, 06:45:49 UTC | Merge branch 'maint' * maint: Revert "core.abbrevguard: Ensure short object names stay unique a bit longer" | 11 March 2011, 06:45:49 UTC |
| ea2c69e | Junio C Hamano | 11 March 2011, 06:41:14 UTC | Revert "core.abbrevguard: Ensure short object names stay unique a bit longer" This reverts commit 72a5b561fc1c4286bc7c5b0693afc076af261e1f, as adding fixed number of hexdigits more than necessary to make one object name locally unique does not help in futureproofing the uniqueness of names we generate today. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 March 2011, 06:41:14 UTC |
| 92a684b | Jonathan Nieder | 25 February 2011, 07:22:12 UTC | i18n: "make distclean" should clean up after "make pot" This is in "make distclean" and not "make clean" to avoid needlessly changing the POT-Creation-Date in the following scenario: make clean; # cleaning up after an old build git pull make pot; # regenerate po template if necessary msgmerge po/my_language.po po/git.pot Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 March 2011, 07:52:52 UTC |
| cd5513a | Ævar Arnfjörð Bjarmason | 22 February 2011, 23:41:23 UTC | i18n: Makefile: "pot" target to extract messages marked for translation Add rules to generate a template (po/git.pot) listing messages marked for translation in the C portion of git. To get started translating, just run "make pot". Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 March 2011, 07:52:52 UTC |
| 0c9ea33 | Jonathan Nieder | 10 March 2011, 03:17:58 UTC | i18n: add stub Q_() wrapper for ngettext The Q_ function translates a string representing some pharse with an alternative plural form and uses the 'count' argument to choose which form to return. Use of Q_ solves the "%d noun(s)" problem in a way that is portable to languages outside the Germanic and Romance families. In English, the semantics of Q_(sing, plur, count) are roughly equivalent to count == 1 ? _(sing) : _(plur) while in other languages there can be more variants (count == 0; more random-looking rules based on the historical pronunciation of the number). Behind the scenes, the singular form is used to look up a family of translations and the plural form is ignored unless no translation is available. Define such a Q_ in gettext.h with the English semantics so C code can start using it to mark phrases with a count for translation. The name "Q_" is taken from subversion and stands for "quantity". Many projects just use ngettext directly without a wrapper analogous to _; we should not do so because git's gettext.h is meant not to conflict with system headers that might include libintl.h. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 March 2011, 07:50:57 UTC |
| 83c3c62 | Junio C Hamano | 10 March 2011, 00:21:16 UTC | Update Release Notes to 1.7.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 March 2011, 00:21:16 UTC |
| 66ecd2d | Junio C Hamano | 09 March 2011, 23:56:17 UTC | Merge branch 'js/cherry-pick-usability' * js/cherry-pick-usability: Teach commit about CHERRY_PICK_HEAD bash: teach __git_ps1 about CHERRY_PICK_HEAD Introduce CHERRY_PICK_HEAD t3507: introduce pristine-detach helper | 09 March 2011, 23:56:17 UTC |
| 75618f1 | Junio C Hamano | 09 March 2011, 23:54:04 UTC | Merge branch 'js/checkout-untracked-symlink' * js/checkout-untracked-symlink: do not overwrite untracked symlinks Demonstrate breakage: checkout overwrites untracked symlink with directory | 09 March 2011, 23:54:04 UTC |
| 3814888 | Junio C Hamano | 09 March 2011, 23:53:32 UTC | Merge branch 'so/submodule-no-update-first-time' * so/submodule-no-update-first-time: t7406: "git submodule update {--merge|--rebase]" with new submodules submodule: no [--merge|--rebase] when newly cloned | 09 March 2011, 23:53:32 UTC |
| f98fd43 | Michael J Gruber | 08 March 2011, 08:31:26 UTC | git-log.txt,rev-list-options.txt: put option blocks in proper order Match the order of the description to the one in which they get applied: commit limiting commit ordering commit formatting diff options Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2011, 23:15:52 UTC |
| 251df09 | Matthieu Moy | 09 March 2011, 20:52:15 UTC | log: fix --max-count when used together with -S or -G The --max-count limit is implemented by counting revisions in get_revision(), but the -S and -G take effect later when running diff. Hence "--max-count=10 -Sfoo" meant "examine the 10 first revisions, and out of them, show only those changing the occurences of foo", not "show 10 revisions changing the occurences of foo". In case the commit isn't actually shown, cancel the decrement of max_count. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2011, 22:28:24 UTC |
| 31f4da5 | Junio C Hamano | 09 March 2011, 22:20:39 UTC | Merge branch 'maint' * maint: Fix typo in t/README ls-remote documentation: <refs> argument is optional Add Author and Documentation sections to git-for-each-ref.txt Documentation: remove redundant colons in git-for-each-ref.txt | 09 March 2011, 22:20:39 UTC |
| 681186a | Mathias Lafeldt | 09 March 2011, 20:25:09 UTC | Fix typo in t/README Signed-off-by: Mathias Lafeldt <misfire@debugon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2011, 20:53:13 UTC |
| 494489a | Piotr Krukowiecki | 09 March 2011, 20:03:48 UTC | ls-remote documentation: <refs> argument is optional Correct SYNOPSIS section. Signed-off-by: Piotr Krukowiecki <piotr.krukowiecki@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2011, 20:32:00 UTC |
| 621c39d | Alexei Sholik | 08 March 2011, 13:16:10 UTC | Add Author and Documentation sections to git-for-each-ref.txt Signed-off-by: Alexei Sholik <alcosholik@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2011, 20:22:15 UTC |
| 22817b4 | Alexei Sholik | 08 March 2011, 13:16:09 UTC | Documentation: remove redundant colons in git-for-each-ref.txt Signed-off-by: Alexei Sholik <alcosholik@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2011, 19:54:56 UTC |
| f7c6c42 | Junio C Hamano | 09 March 2011, 05:37:23 UTC | Merge branch 'maint' * maint: SubmittingPatches: clarify the expected commit log description diff format documentation: clarify --cc and -c rev-list-options.txt: typo fix | 09 March 2011, 05:37:23 UTC |
| 803dbdb | Nicolas Kaiser | 04 March 2011, 23:16:26 UTC | transport-helper.c: fix check for (size_t < 0) 'bytes' is of type size_t which is unsigned thus can't be negative. But the assigned write() returns ssize_t, and -1 on error. For testing < 0, 'bytes' needs to be of a signed type. Signed-off-by: Nicolas Kaiser <nikai@nikai.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2011, 05:36:12 UTC |
| d0f7dcb | Junio C Hamano | 09 March 2011, 00:58:19 UTC | SubmittingPatches: clarify the expected commit log description Earlier, 47afed5 (SubmittingPatches: itemize and reflect upon well written changes, 2009-04-28) added a discussion on the contents of the commit log message, but the last part of the new paragraph didn't make much sense. Reword it slightly to make it more readable. Update the "quicklist" to clarify what we mean by "motivation" and "contrast". Also mildly discourage external references. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2011, 05:35:22 UTC |
