AgeCommit message (Collapse)Author
2011-03-17Name make_*_path functions more accuratelyCarlos Martín Nieto
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 <> Signed-off-by: Junio C Hamano <>
2011-03-17RelNotes/1.7.5.txt: typo and language fixesMichael J Gruber
Also remove entries for fixes that are already present in the maintenance track. Signed-off-by: Michael J Gruber <> Signed-off-by: Junio C Hamano <>
2011-03-16Merge branch 'maint'Junio C Hamano
* maint: Prepare draft release notes to 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
2011-03-16Prepare draft release notes to C Hamano
Signed-off-by: Junio C Hamano <>
2011-03-16Merge branch 'jn/maint-commit-missing-template' into maintJunio C Hamano
* jn/maint-commit-missing-template: commit: error out for missing commit message template
2011-03-16Merge branch 'lt/rename-no-extra-copy-detection' into maintJunio C Hamano
* 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
2011-03-16Merge branch 'jk/diffstat-binary' into maintJunio C Hamano
* jk/diffstat-binary: diff: don't retrieve binary blobs for diffstat diff: handle diffstat of rewritten binary files
2011-03-16Merge branch 'mg/maint-difftool-vim-readonly' into maintJunio C Hamano
* mg/maint-difftool-vim-readonly: mergetool-lib: call vim in readonly mode for diffs
2011-03-16Merge branch 'jn/test-terminal-punt-on-osx-breakage' into maintJunio C Hamano
* jn/test-terminal-punt-on-osx-breakage: tests: skip terminal output tests on OS X
2011-03-16Merge branch 'jk/fail-null-clone' into maintJunio C Hamano
* jk/fail-null-clone: clone: die when trying to clone missing local path
2011-03-16Merge branch 'jh/push-default-upstream-configname' into maintJunio C Hamano
* jh/push-default-upstream-configname: push.default: Rename 'tracking' to 'upstream'
2011-03-16Merge branch 'mg/placeholders-are-lowercase' into maintJunio C Hamano
* 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
2011-03-16Merge branch 'mg/patch-id' into maintJunio C Hamano
* mg/patch-id: git-patch-id: do not trip over "no newline" markers git-patch-id: test for "no newline" markers
2011-03-16Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maintJunio C Hamano
* js/maint-merge-use-prepare-commit-msg-hook: merge: honor prepare-commit-msg hook
2011-03-16gitweb: highlight: replace tabs with spacesKevin Cernekee
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 <> Acked-by: John 'Warthog9' Hawley <> Signed-off-by: Junio C Hamano <>
2011-03-16make_absolute_path: return the input path if it points to our bufferCarlos Martín Nieto
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 <> Signed-off-by: Junio C Hamano <>
2011-03-16valgrind: ignore SSE-based strlen invalid readsCarlos Martín Nieto
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 <> Signed-off-by: Junio C Hamano <>
2011-03-16vcs-svn: remove spurious semicolonsJonathan Nieder
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 <> Signed-off-by: Junio C Hamano <>
2011-03-16diff --submodule: split into bite-sized piecesJonathan Nieder
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 <> Acked-by: Jens Lehmann <> Signed-off-by: Junio C Hamano <>
2011-03-16cherry: split off function to print output linesJonathan Nieder
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 <> Signed-off-by: Junio C Hamano <>
2011-03-16branch: split off function that writes tracking info and commit subjectJonathan Nieder
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 <> Signed-off-by: Junio C Hamano <>
2011-03-16standardize brace placement in struct definitionsJonathan Nieder
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 <> Signed-off-by: Junio C Hamano <>
2011-03-16compat: make gcc bswap an inline functionJonathan Nieder
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 <> Signed-off-by: Junio C Hamano <>
2011-03-16enums: omit trailing comma for portabilityJonathan Nieder
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 <> Signed-off-by: Junio C Hamano <>
2011-03-16Merge branch 'nd/struct-pathspec'Junio C Hamano
* nd/struct-pathspec: declare 1-bit bitfields to be unsigned
2011-03-16declare 1-bit bitfields to be unsignedJonathan Nieder
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 <> Signed-off-by: Junio C Hamano <>
2011-03-15Update draft release notes to 1.7.5Junio C Hamano
Signed-off-by: Junio C Hamano <>
2011-03-15Merge branch 'jk/strbuf-vaddf'Junio C Hamano
* jk/strbuf-vaddf: compat: fall back on __va_copy if available strbuf: add strbuf_vaddf compat: provide a fallback va_copy definition
2011-03-15Merge branch 'mm/push-default-advice'Junio C Hamano
* mm/push-default-advice: push: better error message when no remote configured push: better error messages when push.default = tracking
2011-03-15Merge branch 'jn/maint-instaweb-plack-fix'Junio C Hamano
* jn/maint-instaweb-plack-fix: git-instaweb: Change how gitweb.psgi is made runnable as standalone app
2011-03-15Merge branch 'sp/maint-fd-limit'Junio C Hamano
* 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
2011-03-15Merge branch 'jc/checkout-orphan-warning'Junio C Hamano
* jc/checkout-orphan-warning: commit: give final warning when reattaching HEAD to leave commits behind
2011-03-15Merge branch 'jh/maint-do-not-track-non-branches'Junio C Hamano
* jh/maint-do-not-track-non-branches: branch/checkout --track: Ensure that upstream branch is indeed a branch
2011-03-15Merge branch 'fk/maint-cvsimport-early-failure'Junio C Hamano
* fk/maint-cvsimport-early-failure: git-cvsimport.perl: Bail out right away when reading from the server fails
2011-03-15Merge branch 'jc/maint-apply-report-offset'Junio C Hamano
* jc/maint-apply-report-offset: apply -v: show offset count when patch did not apply exactly
2011-03-15Merge branch 'jc/maint-apply-no-double-patch'Junio C Hamano
* jc/maint-apply-no-double-patch: apply: do not patch lines that were already patched
2011-03-15Merge branch 'mr/hpux'Junio C Hamano
* mr/hpux: git-compat-util.h: Honor HP C's noreturn attribute Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section
2011-03-15Documentation: running test with --debug keeps "trash" directoryPiotr Krukowiecki
Signed-off-by: Piotr Krukowiecki <> Signed-off-by: Junio C Hamano <>
2011-03-15Merge branch 'jk/doc-credits' of git:// C Hamano
* 'jk/doc-credits' of git:// docs: point git.txt author credits to doc: add missing git footers doc: drop author/documentation sections from most pages
2011-03-14Merge branch 'sp/maint-smart-http-sans-100-continue'Junio C Hamano
* sp/maint-smart-http-sans-100-continue: smart-http: Really never use Expect: 100-continue
2011-03-14smart-http: Really never use Expect: 100-continueShawn O. Pearce
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 <> Signed-off-by: Junio C Hamano <>
2011-03-14Documentation: "rebase <onto> <that>" stays on <that> branch upon exitDrew Northup
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 <> Signed-off-by: Junio C Hamano <>
2011-03-14object.h: Remove obsolete struct object_refsJakob Pfender
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 <> Signed-off-by: Junio C Hamano <>
2011-03-13Merge branch 'pw/p4'Junio C Hamano
* pw/p4: git-p4: test clone @all git-p4: fix clone @all regression
2011-03-13git-p4: test clone @allPete Wyckoff
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 <> Signed-off-by: Junio C Hamano <>
2011-03-13git-p4: fix clone @all regressionPete Wyckoff
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 <> Reported-by: Anatol Pomozov <> Based-on-patch-by: Tor Arvid Lund <> Signed-off-by: Junio C Hamano <>
2011-03-13docs: point git.txt author credits to git-scm.comJeff King
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.
2011-03-11doc: add missing git footersJeff King
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.
2011-03-11doc: drop author/documentation sections from most pagesJeff King
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.
2011-03-11Merge branch 'maint'Junio C Hamano
* maint: Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"