Skip to main content

Browse the archive

https://github.com/git/git
31 May 2024, 23:06:24 UTC
sort by:
Revision Author Date Message Commit Date
ccef604 Junio C Hamano 24 August 2011, 19:16:58 UTC Git 1.7.6.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 August 2011, 19:16:58 UTC
c43a1be Junio C Hamano 24 August 2011, 19:16:15 UTC Merge branch 'jc/maint-smart-http-race-upload-pack' into maint * jc/maint-smart-http-race-upload-pack: get_indexed_object can return NULL if nothing is in that slot; check for it 24 August 2011, 19:16:15 UTC
2a74532 Brian Harring 24 August 2011, 05:47:17 UTC get_indexed_object can return NULL if nothing is in that slot; check for it This fixes a segfault introduced by 051e400; via it, no longer able to trigger the http/smartserv race. Signed-off-by: Brian Harring <ferringb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 August 2011, 17:50:33 UTC
b0b35a6 Junio C Hamano 23 August 2011, 22:28:18 UTC Update draft release notes for 1.7.6.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 August 2011, 22:28:18 UTC
c9321a0 Junio C Hamano 23 August 2011, 22:27:30 UTC Merge branch 'jc/maint-combined-diff-work-tree' into maint * jc/maint-combined-diff-work-tree: diff -c/--cc: do not mistake "resolved as deletion" as "use working tree" Conflicts: combine-diff.c 23 August 2011, 22:27:30 UTC
36bad9d Junio C Hamano 23 August 2011, 22:20:06 UTC Merge branch 'cb/maint-exec-error-report' into maint * cb/maint-exec-error-report: notice error exit from pager error_routine: use parent's stderr if exec fails 23 August 2011, 22:20:06 UTC
ffa69e6 Junio C Hamano 23 August 2011, 22:19:45 UTC Merge branch 'cb/maint-quiet-push' into maint * cb/maint-quiet-push: receive-pack: do not overstep command line argument array propagate --quiet to send-pack/receive-pack Conflicts: Documentation/git-receive-pack.txt Documentation/git-send-pack.txt 23 August 2011, 22:19:45 UTC
4a13c4d Junio C Hamano 23 August 2011, 22:17:50 UTC Merge branch 'jc/maint-smart-http-race-upload-pack' into maint * jc/maint-smart-http-race-upload-pack: helping smart-http/stateless-rpc fetch race 23 August 2011, 22:17:50 UTC
02c2c60 Junio C Hamano 23 August 2011, 22:17:14 UTC Merge branch 'jc/no-gitweb-test-without-cgi-etc' into maint * jc/no-gitweb-test-without-cgi-etc: t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met 23 August 2011, 22:17:14 UTC
1be9d84 Heiko Voigt 22 August 2011, 20:36:45 UTC add technical documentation about ref iteration Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 August 2011, 22:01:14 UTC
885b797 Michael Haggerty 22 August 2011, 10:33:52 UTC Do not use C++-style comments Detected by "gcc -std=iso9899:1990 ...". This patch applies against "maint". Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 August 2011, 17:07:07 UTC
ec09954 Nguyễn Thái Ngọc Duy 18 August 2011, 13:36:03 UTC fetch-pack: check for valid commit from server A malicious server can return ACK with non-existent SHA-1 or not a commit. lookup_commit() in this case may return NULL. Do not let fetch-pack crash by accessing NULL address in this case. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 August 2011, 19:25:54 UTC
a47a645 Nguyễn Thái Ngọc Duy 17 August 2011, 12:22:13 UTC checkout-index: remove obsolete comment The first paragraph about flag order is no longer true and is mentioned in git-checkout-index.txt. The rest is also mentioned in git-checkout-index.txt. Remove it and keep uptodate document in one place. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 August 2011, 17:39:47 UTC
8499644 Junio C Hamano 16 August 2011, 19:13:38 UTC Prepare for 1.7.6.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 August 2011, 19:42:17 UTC
1f2705e Junio C Hamano 16 August 2011, 19:41:14 UTC Merge branch 'jk/tag-list-multiple-patterns' into maint * jk/tag-list-multiple-patterns: tag: accept multiple patterns for --list 16 August 2011, 19:41:14 UTC
1320352 Junio C Hamano 16 August 2011, 19:41:14 UTC Merge branch 'jl/submodule-update-quiet' into maint * jl/submodule-update-quiet: submodule: update and add must honor --quiet flag 16 August 2011, 19:41:14 UTC
f4af7f1 Junio C Hamano 16 August 2011, 19:41:13 UTC Merge branch 'jl/submodule-add-relurl-wo-upstream' into maint * jl/submodule-add-relurl-wo-upstream: submodule add: clean up duplicated code submodule add: allow relative repository path even when no url is set submodule add: test failure when url is not configured in superproject Conflicts: git-submodule.sh 16 August 2011, 19:41:13 UTC
2a76497 Junio C Hamano 16 August 2011, 19:41:13 UTC Merge branch 'oa/pull-reflog' into maint * oa/pull-reflog: pull: remove extra space from reflog message 16 August 2011, 19:41:13 UTC
64b9db5 Junio C Hamano 16 August 2011, 19:41:12 UTC Merge branch 'js/ls-tree-error' into maint * js/ls-tree-error: Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails. Add a test to check that git ls-tree sets non-zero exit code on error. 16 August 2011, 19:41:12 UTC
5480861 Junio C Hamano 16 August 2011, 19:41:12 UTC Merge branch 'jk/fast-export-quote-path' into maint * jk/fast-export-quote-path: fast-export: quote paths in output 16 August 2011, 19:41:12 UTC
a1ee40f Junio C Hamano 16 August 2011, 19:41:12 UTC Merge branch 'jc/checkout-reflog-fix' into maint * jc/checkout-reflog-fix: checkout: do not write bogus reflog entry out 16 August 2011, 19:41:12 UTC
7aa5089 Junio C Hamano 16 August 2011, 18:41:28 UTC Merge branch 'jc/maint-reset-unmerged-path' into maint * jc/maint-reset-unmerged-path: reset [<commit>] paths...: do not mishandle unmerged paths 16 August 2011, 18:41:28 UTC
b5e104a Junio C Hamano 16 August 2011, 18:41:28 UTC Merge branch 'mz/doc-rebase-abort' into maint * mz/doc-rebase-abort: rebase: clarify "restore the original branch" 16 August 2011, 18:41:28 UTC
22d9b79 Junio C Hamano 16 August 2011, 18:41:28 UTC Merge branch 'bw/log-all-ref-updates-doc' into maint * bw/log-all-ref-updates-doc: Documentation: clearly specify what refs are honored by core.logAllRefUpdates 16 August 2011, 18:41:28 UTC
cd145e7 Junio C Hamano 16 August 2011, 18:41:27 UTC Merge branch 'js/maint-add-path-stat-pwd' into maint * js/maint-add-path-stat-pwd: get_pwd_cwd(): Do not trust st_dev/st_ino blindly 16 August 2011, 18:41:27 UTC
8516c1c Junio C Hamano 16 August 2011, 18:41:27 UTC Merge branch 'ms/help-unknown' into maint * ms/help-unknown: help_unknown_cmd: do not propose an "unknown" cmd 16 August 2011, 18:41:27 UTC
412403e Junio C Hamano 16 August 2011, 18:41:26 UTC Merge branch 'mz/doc-synopsis-verse' into maint * mz/doc-synopsis-verse: Documentation: use [verse] for SYNOPSIS sections 16 August 2011, 18:41:26 UTC
5329c99 Junio C Hamano 16 August 2011, 18:41:26 UTC Merge branch 'jn/mime-type-with-params' into maint * jn/mime-type-with-params: gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss 16 August 2011, 18:41:26 UTC
4a5a800 Junio C Hamano 16 August 2011, 18:41:26 UTC Merge branch 'jc/submodule-sync-no-auto-vivify' into maint * jc/submodule-sync-no-auto-vivify: submodule add: always initialize .git/config entry submodule sync: do not auto-vivify uninteresting submodule 16 August 2011, 18:41:26 UTC
a35d78c Junio C Hamano 16 August 2011, 18:23:26 UTC Merge branch 'jc/zlib-wrap' into maint * jc/zlib-wrap: zlib: allow feeding more than 4GB in one go zlib: zlib can only process 4GB at a time zlib: wrap deflateBound() too zlib: wrap deflate side of the API zlib: wrap inflateInit2 used to accept only for gzip format zlib: wrap remaining calls to direct inflate/inflateEnd zlib wrapper: refactor error message formatter 16 August 2011, 18:23:26 UTC
184cb4d Junio C Hamano 16 August 2011, 18:23:26 UTC Merge branch 'fk/relink-upon-ldflags-update' into maint * fk/relink-upon-ldflags-update: Makefile: Track changes to LDFLAGS and relink when necessary 16 August 2011, 18:23:26 UTC
d5c756e Junio C Hamano 16 August 2011, 18:23:26 UTC Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4' into maint * bc/submodule-foreach-stdin-fix-1.7.4: git-submodule.sh: preserve stdin for the command spawned by foreach t/t7407: demonstrate that the command called by 'submodule foreach' loses stdin 16 August 2011, 18:23:26 UTC
824f4a9 Junio C Hamano 16 August 2011, 18:23:25 UTC Merge branch 'aw/rebase-i-p' into maint * aw/rebase-i-p: rebase -i -p: include non-first-parent commits in todo list 16 August 2011, 18:23:25 UTC
f253376 Junio C Hamano 16 August 2011, 18:23:25 UTC Merge branch 'jc/diff-index-quick-exit-early' into maint * jc/diff-index-quick-exit-early: diff-index --quiet: learn the "stop feeding the backend early" logic Conflicts: unpack-trees.h 16 August 2011, 18:23:25 UTC
e10e476 Junio C Hamano 16 August 2011, 18:23:24 UTC Merge branch 'jk/combine-diff-binary-etc' into maint * jk/combine-diff-binary-etc: combine-diff: respect textconv attributes refactor get_textconv to not require diff_filespec combine-diff: handle binary files as binary combine-diff: calculate mode_differs earlier combine-diff: split header printing into its own function 16 August 2011, 18:23:24 UTC
2a6f08a Jeff King 16 August 2011, 00:13:07 UTC am: refresh the index at start and --resolved If a file is unchanged but stat-dirty, we may erroneously fail to apply patches, thinking that they conflict with a dirty working tree. This patch adds a call to "update-index --refresh". It comes as late as possible, so that we don't bother with it for thinks like "git rebase --abort", or when mbox-splitting fails. However, it does come before we actually start applying patches, meaning we will only call it once when we start applying patches (or any time we return to "am" after having resolved conflicts), and not once per patch. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 August 2011, 18:15:41 UTC
051e400 Junio C Hamano 05 August 2011, 20:54:06 UTC helping smart-http/stateless-rpc fetch race A request to fetch from a client over smart HTTP protocol is served in multiple steps. In the first round, the server side shows the set of refs it has and their values, and the client picks from them and sends "I want to fetch the history leading to these commits". When the server tries to respond to this second request, its refs may have progressed by a push from elsewhere. By design, we do not allow fetching objects that are not at the tip of an advertised ref, and the server rejects such a request. The client needs to try again, which is not ideal especially for a busy server. Teach upload-pack (which is the workhorse driven by git-daemon and smart http server interface) that it is OK for a smart-http client to ask for commits that are not at the tip of any advertised ref, as long as they are reachable from advertised refs. Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 August 2011, 22:33:28 UTC
0d086b8 Junio C Hamano 08 August 2011, 19:31:01 UTC receive-pack: do not overstep command line argument array Previous commit added one element to the command line, without making sure the result fits there. Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 August 2011, 19:31:01 UTC
0906f6e Michael Witten 07 August 2011, 02:44:43 UTC filter-branch: Export variable `workdir' for --commit-filter According to `git help filter-branch': --commit-filter <command> ... You can use the _map_ convenience function in this filter, and other convenience functions, too... ... However, it turns out that `map' hasn't been usable because it depends on the variable `workdir', which is not propogated to the environment of the shell that runs the commit-filter <command> because the shell is created via a simple-command rather than a compound-command subshell: @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \ $(git write-tree) $parentstr < ../message > ../map/$commit || die "could not write rewritten commit" One solution is simply to export `workdir'. However, it seems rather heavy-handed to export `workdir' to the environments of all commands, so instead this commit exports `workdir' for only the duration of the shell command in question: workdir=$workdir @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \ $(git write-tree) $parentstr < ../message > ../map/$commit || die "could not write rewritten commit" Signed-off-by: Michael Witten <mfwitten@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 August 2011, 19:09:38 UTC
ae8044a Emilio G. Cota 08 August 2011, 08:33:05 UTC Documentation/Makefile: add *.pdf to `clean' target user-manual.pdf is not removed by `make clean'; fix it. Signed-off-by: Emilio G. Cota <cota@braap.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 August 2011, 16:30:14 UTC
070648e Emilio G. Cota 08 August 2011, 08:33:04 UTC Documentation: ignore *.pdf files user-manual.pdf is generated by the build and therefore should be ignored by git. Signed-off-by: Emilio G. Cota <cota@braap.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 August 2011, 16:30:12 UTC
6280dfd Jeff King 05 August 2011, 22:36:22 UTC fast-export: quote paths in output Many pathnames in a fast-import stream need to be quoted. In particular: 1. Pathnames at the end of an "M" or "D" line need quoting if they contain a LF or start with double-quote. 2. Pathnames on a "C" or "R" line need quoting as above, but also if they contain spaces. For (1), we weren't quoting at all. For (2), we put double-quotes around the paths to handle spaces, but ignored the possibility that they would need further quoting. This patch checks whether each pathname needs c-style quoting, and uses it. This is slightly overkill for (1), which doesn't actually need to quote many characters that vanilla c-style quoting does. However, it shouldn't hurt, as any implementation needs to be ready to handle quoted strings anyway. In addition to adding a test, we have to tweak a test which blindly assumed that case (2) would always use double-quotes, whether it needed to or not. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 August 2011, 22:56:54 UTC
9969454 Junio C Hamano 04 August 2011, 18:39:10 UTC diff -c/--cc: do not mistake "resolved as deletion" as "use working tree" The combined diff machinery can be used to compare: - a merge commit with its parent commits; - a working-tree file with multiple stages in an unmerged index; or - a working-tree file with the HEAD and the index. The internal function combine-diff.c:show_patch_diff() checked if it needs to read the "result" from the working tree by looking at the object name of the result --- if it is null_sha1, it read from the working tree. This mistook a merge that records a deletion as the conflict resolution as if it is a cue to read from the working tree. Pass this information explicitly from the caller instead. Noticed and reported by Johan Herland. Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 August 2011, 19:05:47 UTC
e9e0643 Heiko Voigt 03 August 2011, 18:06:17 UTC add gitignore entry to description about how to write a builtin If the author forgets the gitignore entry the built result will show up as new file in the git working directory. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 03 August 2011, 18:44:23 UTC
0922570 Michael Haggerty 03 August 2011, 13:41:30 UTC gitattributes: Reword "attribute macro" to "macro attribute" The new wording makes it clearer that such a beast is an attribute in addition to being a macro (as opposed to being only a macro that is used for attributes). Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 03 August 2011, 17:32:54 UTC
98e8406 Michael Haggerty 03 August 2011, 13:41:29 UTC gitattributes: Clarify discussion of attribute macros In particular, make it clear that attribute macros are themselves recorded as attributes in addition to setting other attributes. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 03 August 2011, 17:32:02 UTC
fc1b56f Clemens Buchacher 01 August 2011, 17:59:21 UTC notice error exit from pager If the pager fails to run, git produces no output, e.g.: $ GIT_PAGER=not-a-command git log The error reporting fails for two reasons: (1) start_command: There is a mechanism that detects errors during execvp introduced in 2b541bf8 (start_command: detect execvp failures early). The child writes one byte to a pipe only if execvp fails. The parent waits for either EOF, when the successful execvp automatically closes the pipe (see FD_CLOEXEC in fcntl(1)), or it reads a single byte, in which case it knows that the execvp failed. This mechanism is incompatible with the workaround introduced in 35ce8622 (pager: Work around window resizing bug in 'less'), which waits for input from the parent before the exec. Since both the parent and the child are waiting for input from each other, that would result in a deadlock. In order to avoid that, the mechanism is disabled by closing the child_notifier file descriptor. (2) finish_command: The parent correctly detects the 127 exit status from the child, but the error output goes nowhere, since by that time it is already being redirected to the child. No simple solution for (1) comes to mind. Number (2) can be solved by not sending error output to the pager. Not redirecting error output to the pager can result in the pager overwriting error output with standard output, however. Since there is no reliable way to handle error reporting in the parent, produce the output in the child instead. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 August 2011, 23:21:55 UTC
c98d1e4 Ori Avtalion 29 July 2011, 07:19:26 UTC pull: remove extra space from reflog message When executing "git pull" with no arguments, the reflog message was: "pull : Fast-forward" Signed-off-by: Ori Avtalion <ori@avtalion.name> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 August 2011, 23:05:44 UTC
3503b8d Junio C Hamano 01 August 2011, 21:44:24 UTC Merge branch 'nk/ref-doc' into maint * nk/ref-doc: glossary: clarify description of HEAD glossary: update description of head and ref glossary: update description of "tag" git.txt: de-emphasize the implementation detail of a ref check-ref-format doc: de-emphasize the implementation detail of a ref git-remote.txt: avoid sounding as if loose refs are the only ones in the world git-remote.txt: fix wrong remote refspec 01 August 2011, 21:44:24 UTC
62607e4 Junio C Hamano 01 August 2011, 21:44:17 UTC Merge branch 'jl/maint-fetch-recursive-fix' into maint * jl/maint-fetch-recursive-fix: fetch: Also fetch submodules in subdirectories in on-demand mode 01 August 2011, 21:44:17 UTC
6124690 Junio C Hamano 01 August 2011, 21:44:13 UTC Merge branch 'jc/maint-cygwin-trust-executable-bit-default' into maint * jc/maint-cygwin-trust-executable-bit-default: cygwin: trust executable bit by default 01 August 2011, 21:44:13 UTC
d48929e Junio C Hamano 01 August 2011, 21:43:58 UTC Merge branch 'jc/legacy-loose-object' into maint * jc/legacy-loose-object: sha1_file.c: "legacy" is really the current format 01 August 2011, 21:43:58 UTC
3e8cd96 Junio C Hamano 01 August 2011, 21:43:53 UTC Merge branch 'an/shallow-doc' into maint * an/shallow-doc: Document the underlying protocol used by shallow repositories and --depth commands. Fix documentation of fetch-pack that implies that the client can disconnect after sending wants. 01 August 2011, 21:43:53 UTC
055f2c5 Junio C Hamano 01 August 2011, 21:43:18 UTC Merge branch 'jc/maint-1.7.3-checkout-describe' into maint * jc/maint-1.7.3-checkout-describe: checkout -b <name>: correctly detect existing branch 01 August 2011, 21:43:18 UTC
e08afec Erik Faye-Lund 01 August 2011, 11:16:09 UTC connect: correctly number ipv6 network adapter In ba50532, the variable 'cnt' was added to both the IPv6 and the IPv4 version of git_tcp_connect_sock, intended to identify which network adapter the connection failed on. But in the IPv6 version, the variable was never increased, leaving it constantly at zero. This behaviour isn't very useful, so let's fix it by increasing the variable at every loop-iteration. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 August 2011, 17:47:36 UTC
90a6c7d Clemens Buchacher 30 July 2011, 12:10:14 UTC propagate --quiet to send-pack/receive-pack Currently, git push --quiet produces some non-error output, e.g.: $ git push --quiet Unpacking objects: 100% (3/3), done. Add the --quiet option to send-pack/receive-pack and pass it to unpack-objects in the receive-pack codepath and to receive-pack in the push codepath. This fixes a bug reported for the fedora git package: https://bugzilla.redhat.com/show_bug.cgi?id=725593 Reported-by: Jesse Keating <jkeating@redhat.com> Cc: Todd Zullinger <tmz@pobox.com> Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 August 2011, 01:45:41 UTC
d5b6629 Nguyễn Thái Ngọc Duy 30 July 2011, 03:55:05 UTC Break down no-lstat() condition checks in verify_uptodate() Make it easier to grok under what conditions we can skip lstat(). While at there, shorten ie_match_stat() line for the sake of my eyes. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 August 2011, 01:42:38 UTC
dd008b3 Jeff King 30 July 2011, 15:05:54 UTC t7400: fix bogus test failure with symlinked trash One of the tests in t7400 fails if the trash directory has a symlink anywhere in its path. E.g.: $ mkdir /tmp/git-test $ mkdir /tmp/git-test/real $ ln -s real /tmp/git-test/link $ ./t7400-submodule-basic --root=/tmp/git-test/real ... # passed all 44 test(s) $ ./t7400-submodule-basic --root=/tmp/git-test/link ... not ok - 41 use superproject as upstream when path is relative and no url is set there The failing test does: git submodule add ../repo relative && ... git submodule sync relative && test "$(git config submodule.relative.url)" = "$submodurl/repo" where $submodurl comes from the $TRASH_DIRECTORY the user gave us. However, git will resolve symlinks when converting the relative path into an absolute one, leading them to be textually different (even though they point to the same directory). Fix this by asking pwd to canonicalize the name of the trash directory for us. Signed-off-by: Jeff King <peff@peff.net> Acked-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 August 2011, 01:40:34 UTC
3bc4181 Clemens Buchacher 27 July 2011, 21:32:34 UTC error_routine: use parent's stderr if exec fails The new process's error output may be redirected elsewhere, but if the exec fails, output should still go to the parent's stderr. This has already been done for the die_routine. Do the same for error_routine. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 August 2011, 01:27:07 UTC
e44b6df Carlos Martín Nieto 26 July 2011, 12:27:57 UTC Documentation: clarify the invalidated tree entry format When the entry_count is -1, the tree is invalidated and therefore has not associated hash (or object name). Explicitly state that the next entry starts after the newline. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 August 2011, 01:23:49 UTC
7e60407 Jens Lehmann 26 July 2011, 21:39:03 UTC submodule: update and add must honor --quiet flag When using the --quiet flag "git submodule update" and "git submodule add" didn't behave as the documentation stated. They printed progress output from the clone, even though they should only print error messages. Fix that by passing the -q flag to git clone in module_clone() when the GIT_QUIET variable is set. Two tests in t7400 have been modified to test that behavior. Reported-by: Daniel Holtmann-Rice <flyingtabmow@gmail.com> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 July 2011, 19:48:26 UTC
04f8925 Jon Seymour 24 July 2011, 14:59:14 UTC Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails. In the case of a corrupt repository, git ls-tree may report an error but presently it exits with a code of 0. This change uses the return code of read_tree_recursive instead. Improved-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 July 2011, 17:50:11 UTC
2579e1d Jens Lehmann 24 July 2011, 13:35:54 UTC tests: print failed test numbers at the end of the test run On modern multi-core processors "make test" is often run in multiple jobs. If one of them fails the test run does stop, but the concurrently running tests finish their run. It is rather easy to find out which test failed by doing a "ls -d t/trash*". But that only works when you don't use the "-i" option to "make test" because you want to get an overview of all failing tests. In that case all thrash directories are deleted end and the information which tests failed is lost. If one or more tests failed, print a list of them before the test summary: failed test(s): t1000 t6500 fixed 0 success 7638 failed 3 broken 49 total 7723 This makes it possible to just run the test suite with -i and collect all failed test scripts at the end for further examination. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 July 2011, 18:55:14 UTC
6c1c144 Jon Seymour 24 July 2011, 14:59:13 UTC Add a test to check that git ls-tree sets non-zero exit code on error. Expected to fail at this commit, fixed by subsequent commit. Additional tests of adhoc or uncategorised nature should be added to this file. Improved-by: Jens Lehmann <Jens.Lehmann@web.de> Improved-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 July 2011, 18:48:24 UTC
b421812 Dmitry Ivankov 13 July 2011, 17:10:53 UTC doc/fast-import: clarify notemodify command The "notemodify" fast-import command was introduced in commit a8dd2e7 (fast-import: Add support for importing commit notes, 2009-10-09) The commit log has slightly different description than the added documentation. The latter is somewhat confusing. "notemodify" is a subcommand of "commit" command used to add a note for some commit. Does this note annotate the commit produced by the "commit" command or a commit given by it's committish parameter? Which notes tree does it write notes to? The exact meaning could be deduced with old description and some notes machinery knowledge. But let's make it more obvious. This command is used in a context like "commit refs/notes/test" to add or rewrite an annotation for a committish parameter. So the advised way to add notes in a fast-import stream is: 1) import some commits (optional) 2) prepare a "commit" to the notes tree: 2.1) choose notes ref, committer, log message, etc. 2.2) create annotations with "notemodify", where each can refer to a commit being annotated via a branch name, import mark reference, sha1 and other expressions specified in the Documentation. Signed-off-by: Dmitry Ivankov <divanorama@gmail.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 July 2011, 20:58:35 UTC
df6b0ca Jack Nagel 22 July 2011, 01:33:15 UTC Documentation: minor grammatical fix in rev-list-options.txt Signed-off-by: Jack Nagel <jacknagel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 July 2011, 17:38:59 UTC
0dc310e Peter Collingbourne 21 July 2011, 15:10:52 UTC Documentation: git-filter-branch honors replacement refs Make it clear that git-filter-branch will honor and make permanent replacement refs as well as grafts. Signed-off-by: Peter Collingbourne <peter@pcc.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 July 2011, 19:54:55 UTC
6e8e67f Julian Phillips 16 July 2011, 18:23:51 UTC remote-curl: Add a format check to parsing of info/refs When parsing info/refs, no checks were applied that the file was in the requried format. Since the file is read from a remote webserver, this isn't guarenteed to be true. Add a check that the file at least only contains lines that consist of 40 characters followed by a tab and then the ref name. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 July 2011, 22:51:55 UTC
8b59007 Pavan Kumar Sunkara 16 July 2011, 21:55:52 UTC git-config: Remove extra whitespaces Remove extra whitespaces introduced by commits 01ebb9dc and fc1905bb Signed-off-by: Pavan Kumar Sunkara <pavan.sss1991@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2011, 20:43:34 UTC
5960bc9 Martin von Zweigbergk 14 July 2011, 03:47:06 UTC rebase: clarify "restore the original branch" The description for 'git rebase --abort' currently says: Restore the original branch and abort the rebase operation. The "restore" can be misinterpreted to imply that the original branch was somehow in a broken state during the rebase operation. It is also not completely clear what "the original branch" is --- is it the branch that was checked out before the rebase operation was called or is the the branch that is being rebased (it is the latter)? Although both issues are made clear in the DESCRIPTION section, let us also make the entry in the OPTIONS secion more clear. Also remove the term "rebasing process" from the usage text, since the user already knows that the text is about "git rebase". Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 July 2011, 05:03:12 UTC
ff00b68 Junio C Hamano 14 July 2011, 04:36:29 UTC reset [<commit>] paths...: do not mishandle unmerged paths Because "diff --cached HEAD" showed an incorrect blob object name on the LHS of the diff, we ended up updating the index entry with bogus value, not what we read from the tree. Noticed by John Nowak. Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 July 2011, 04:39:18 UTC
cd8e371 Bert Wesarg 11 July 2011, 09:14:18 UTC Documentation: clearly specify what refs are honored by core.logAllRefUpdates The documentation for logging updates in git-update-ref, doesn't make it clear that only a specific subset of refs are honored by this variable. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 July 2011, 16:11:14 UTC
7d092ad Johannes Schindelin 09 July 2011, 17:38:08 UTC get_pwd_cwd(): Do not trust st_dev/st_ino blindly 10c4c88 (Allow add_path() to add non-existent directories to the path, 2008-07-21) introduced get_pwd_cwd() function in order to favor $PWD when getenv("PWD") and getcwd() refer to the same directory but are different strings (e.g. the former gives a nicer looking name via a symbolic link to an uglier looking automounted path). The function tried to determine if two directories are the same by running stat(2) on both and comparing ino/dev fields. Unfortunately, stat() does not fill any ino or dev fields in msysgit. But there is a telltale: both ino and dev are 0 when they are not filled correctly, so let's be extra cautious. This happens to fix a bug in "get-receive-pack working_directory/" when the GIT_DIR would not be set correctly due to absolute_path(".") returning the wrong value. 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> 11 July 2011, 17:52:38 UTC
823e0de Michael Schubert 08 July 2011, 10:08:49 UTC help_unknown_cmd: do not propose an "unknown" cmd When executing an external shell script like `git foo` with a bad shebang, e.g. "#!/usr/bin/not/existing", execvp returns 127 (ENOENT). Since help_unknown_cmd proposes the use of all external commands similar to the name of the "unknown" command, it suggests the just failed command again. Stop it and give some advice to the user. Helped-by: Jeff King <peff@peff.net> Signed-off-by: Michael Schubert <mschub@elegosoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 July 2011, 15:59:44 UTC
25d3354 Junio C Hamano 06 July 2011, 22:38:28 UTC Merge commit 'v1.7.6' into jc/checkout-reflog-fix * commit 'v1.7.6': (3211 commits) Git 1.7.6 completion: replace core.abbrevguard to core.abbrev Git 1.7.6-rc3 Documentation: git diff --check respects core.whitespace gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled t7810: avoid unportable use of "echo" plug a few coverity-spotted leaks builtin/gc.c: add missing newline in message tests: link shell libraries into valgrind directory t/Makefile: pass test opts to valgrind target properly sh-i18n--envsubst.c: do not #include getopt.h Fix typo: existant->existent Git 1.7.6-rc2 gitweb: do not misparse nonnumeric content tag files that contain a digit Git 1.7.6-rc1 fetch: do not leak a refspec t3703: skip more tests using colons in file names on Windows gitweb: Fix usability of $prevent_xss gitweb: Move "Requirements" up in gitweb/INSTALL gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL ... 06 July 2011, 22:38:28 UTC
71ee7fd Junio C Hamano 06 July 2011, 22:38:18 UTC Merge commit 'v1.7.0' into jc/checkout-reflog-fix * commit 'v1.7.0': (4188 commits) Git 1.7.0 Fix typo in 1.6.6.2 release notes Re-fix check-ref-format documentation mark-up archive documentation: attributes are taken from the tree by default Documentation: minor fixes to RelNotes-1.7.0 bash: support 'git am's new '--continue' option filter-branch: Fix error message for --prune-empty --commit-filter am: switch --resolved to --continue Update draft release notes to 1.7.0 one more time Git 1.6.6.2 t8003: check exit code of command and error message separately check-ref-format documentation: fix enumeration mark-up Documentation: quote braces in {upstream} notation t3902: Protect against OS X normalization blame: prevent a segv when -L given start > EOF git-push: document all the status flags used in the output Fix parsing of imap.preformattedHTML and imap.sslverify git-add documentation: Fix shell quoting example Revert "pack-objects: fix pack generation when using pack_size_limit" archive: simplify archive format guessing ... 06 July 2011, 22:38:18 UTC
4d9e42f Junio C Hamano 06 July 2011, 22:37:42 UTC Merge commit 'v1.6.0' into jc/checkout-reflog-fix * commit 'v1.6.0': (2063 commits) GIT 1.6.0 git-p4: chdir now properly sets PWD environment variable in msysGit Improve error output of git-rebase t9300: replace '!' with test_must_fail Git.pm: Make File::Spec and File::Temp requirement lazy Documentation: document the pager.* configuration setting git-stash: improve synopsis in help and manual page Makefile: building git in cygwin 1.7.0 git-am: ignore --binary option bash-completion: Add non-command git help files to bash-completion Fix t3700 on filesystems which do not support question marks in names Utilise our new p4_read_pipe and p4_write_pipe wrappers Add p4 read_pipe and write_pipe wrappers bash completion: Add '--merge' long option for 'git log' bash completion: Add completion for 'git mergetool' git format-patch documentation: clarify what --cover-letter does bash completion: 'git apply' should use 'fix' not 'strip' t5304-prune: adjust file mtime based on system time rather than file mtime test-parse-options: use appropriate cast in length_callback Fix escaping of glob special characters in pathspecs ... Conflicts: builtin-checkout.c 06 July 2011, 22:37:42 UTC
c5bcf1f Junio C Hamano 06 July 2011, 22:14:43 UTC checkout: do not write bogus reflog entry out As resolve_ref() returns a static buffer that is local to the function, the caller needs to be sure that it will not have any other calls to the function before it uses the returned value, or store it away with a strdup(). The code used old.path to record which branch it used to be on, so that it can say between which branches the switch took place in the reflog, but sometimes it failed to do so. Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 July 2011, 22:15:02 UTC
7791a1d Martin von Zweigbergk 02 July 2011, 02:38:26 UTC Documentation: use [verse] for SYNOPSIS sections The SYNOPSIS sections of most commands that span several lines already use [verse] to retain line breaks. Most commands that don't span several lines seem not to use [verse]. In the HTML output, [verse] does not only preserve line breaks, but also makes the section indented, which causes a slight inconsistency between commands that use [verse] and those that don't. Use [verse] in all SYNOPSIS sections for consistency. Also remove the blank lines from git-fetch.txt and git-rebase.txt to align with the other man pages. In the case of git-rebase.txt, which already uses [verse], the blank line makes the [verse] not apply to the last line, so removing the blank line also makes the formatting within the document more consistent. While at it, add single quotes to 'git cvsimport' for consistency with other commands. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 July 2011, 21:26:26 UTC
d28790d Jeff King 06 July 2011, 15:13:30 UTC docs: document --textconv diff option This has been there since textconv existed, but was never documented. There is some overlap with what's in gitattributes(5), but it's important to warn in both places that textconv diffs probably can't be applied. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 July 2011, 18:10:11 UTC
e8c3531 Jakub Narebski 30 June 2011, 09:39:21 UTC gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss Enhance usability of 'blob_plain' view protection against XSS attacks (enabled by setting $prevent_xss to true) by serving contents inline as safe 'text/plain' mimetype where possible, instead of serving with "Content-Disposition: attachment" to make sure they don't run in gitweb's security domain. This patch broadens downgrading to 'text/plain' further, to any */*+xml mimetype. This includes: application/xhtml+xml (*.xhtml, *.xht) application/atom+xml (*.atom) application/rss+xml (*.rss) application/mathml+xm (*.mathml) application/docbook+xml (*.docbook) image/svg+xml (*.svg, *.svgz) Probably most useful is serving XHTML files as text/plain in 'blob_plain' view, directly viewable. Because file with 'image/svg+xml' mimetype can be compressed SVGZ file, we have to check if */*+xml really is text file, via '-T $fd'. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 June 2011, 18:26:48 UTC
86afbd0 Jakub Narebski 30 June 2011, 09:39:20 UTC gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss One of mechanism enabled by setting $prevent_xss to true is 'blob_plain' view protection. With XSS prevention on, blobs of all types except a few known safe ones are served with "Content-Disposition: attachment" to make sure they don't run in our security domain. Instead of serving text/* type files, except text/plain (and including text/html), as attachements, downgrade it to text/plain. This way HTML pages in 'blob_plain' (raw) view would be displayed in browser, but safely as a source, and not asked to be saved. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 June 2011, 18:26:39 UTC
4dca1aa Brandon Casey 30 June 2011, 00:34:58 UTC git-submodule.sh: preserve stdin for the command spawned by foreach The user-supplied command spawned by 'submodule foreach' loses its connection to the original standard input. Instead, it is connected to the output of a pipe within the git-submodule script. The user-supplied command supplied to 'submodule foreach' is spawned within a while loop which is being piped into. Due to the way shells implement piping output to a while loop, a subshell is created with its standard input attached to the output of the pipe. This results in all of the commands executed within the while loop to have their stdins modified in the same way, including the user-supplied command. This can cause a problem if the command requires reading from stdin or if it changes its behavior based on whether stdin is a tty or not. For example, this problem was noticed when trying to execute the following: git submodule foreach git shortlog --since=two.weeks.ago which printed a message about entering the first submodule and produced no further output and exited with a status of zero. In this case, shortlog detected that it was not connected to a tty, and since no revision was supplied as an argument, it attempted to read the list of revisions from standard input. Instead, it slurped up the list of submodules that was being piped to the enclosing while loop and caused that loop to end early without processing the remaining submodules. Work around this behavior by saving the original standard input file descriptor before the while loop, and restoring it when spawning the user-supplied command. This fixes the tests in t7407. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 June 2011, 01:25:49 UTC
91cd7e4 Brandon Casey 30 June 2011, 00:34:57 UTC t/t7407: demonstrate that the command called by 'submodule foreach' loses stdin The user-supplied command spawned by 'submodule foreach' loses its connection to the original standard input. Instead, it is connected to the output of a pipe within the git-submodule script. This can cause a problem if the command requires reading from stdin or if it changes its behavior based on whether stdin is a tty or not (e.g. git shortlog). Demonstrate this flaw. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 June 2011, 01:24:40 UTC
76c82f9 Junio C Hamano 29 June 2011, 23:42:41 UTC Merge git://bogomips.org/git-svn into maint * git://bogomips.org/git-svn: git-svn: Correctly handle root commits in mergeinfo ranges git-svn: Disambiguate rev-list arguments to improve error message git-svn: Demonstrate a bug with root commits in mergeinfo ranges 29 June 2011, 23:42:41 UTC
f5cfd52 Junio C Hamano 29 June 2011, 23:41:55 UTC Merge branch 'maint-1.7.5' into maint * maint-1.7.5: test: skip clean-up when running under --immediate mode "branch -d" can remove more than one branches 29 June 2011, 23:41:55 UTC
b586744 Junio C Hamano 27 June 2011, 18:02:22 UTC test: skip clean-up when running under --immediate mode Some tests try to be too careful about cleaning themselves up and do test_expect_success description ' set-up some test refs and/or configuration && test_when_finished "revert the above changes" && the real test ' Which is nice to make sure that a potential failure would not have unexpected interaction with the next test. This however interferes when "the real test" fails and we want to see what is going on, by running the test with --immediate mode and descending into its trash directory after the test stops. The precondition to run the real test and cause it to fail is all gone after the clean-up procedure defined by test_when_finished is done. Update test_run_ which is the workhorse of running a test script called from test_expect_success and test_expect_failure, so that we do not run clean-up script defined with test_when_finished when a test that is expected to succeed fails under the --immediate mode. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Jeff King <peff@peff.net> 29 June 2011, 23:38:09 UTC
534cea3 Junio C Hamano 27 June 2011, 22:04:32 UTC "branch -d" can remove more than one branches Since 03feddd (git-check-ref-format: reject funny ref names, 2005-10-13), "git branch -d" can take more than one branch names to remove. The documentation was correct, but the usage string was not. Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 June 2011, 23:35:29 UTC
124b70a Michael Haggerty 18 June 2011, 06:48:00 UTC git-svn: Correctly handle root commits in mergeinfo ranges If the bottom of a mergeinfo range is a commit that maps to a git root commit, then it doesn't have a parent. In such a case, use git commit range "$top_commit" rather than "$bottom_commit^..$top_commit". [ew: line-wrap at 80 columns] Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Acked-by: Eric Wong <normalperson@yhbt.net> 28 June 2011, 03:26:11 UTC
eabd73a Michael Haggerty 18 June 2011, 06:47:59 UTC git-svn: Disambiguate rev-list arguments to improve error message Add "--" in the "git rev-list" command line so that if there is a bug and the revisions cannot be found, the error message is a bit less cryptic. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Acked-by: Eric Wong <normalperson@yhbt.net> 28 June 2011, 03:26:08 UTC
555bdc6 Michael Haggerty 18 June 2011, 06:47:58 UTC git-svn: Demonstrate a bug with root commits in mergeinfo ranges If a svn:mergeinfo range starts at a commit that was converted as a git root commit (e.g., r1 or a branch that was created out of thin air), then there is an error when git-svn tries to run git rev-list "$bottom_commit^..$top_commit" because $bottom_commit (the git commit corresponding to r1) has no parent. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Acked-by: Eric Wong <normalperson@yhbt.net> 28 June 2011, 03:26:06 UTC
2cd9de3 Jens Lehmann 25 June 2011, 23:26:02 UTC submodule add: always initialize .git/config entry When "git submodule add $path" is run to add a subdirectory $path to the superproject, and $path is already the top of the working tree of the submodule repository, the command created submodule.$path.url entry in the configuration file in the superproject. However, when adding a repository $URL that is outside the respository of the superproject to $path that does not exist (yet) with "git submodule add $URL $path", the command forgot to set it up. The user is expressing the interest in the submodule and wants to keep a checkout, the "submodule add" command should consistently set up the submodule.$path.url entry in either case. As a result "git submodule init" can't simply skip the initialization of those submodules for which it finds an url entry in the git./config anymore. That lead to problems when adding a submodule (which now sets the url), add the "update" setting to .gitmodules and expect init to copy that into .git/config like it is done in t7406. So change init to only then copy the "url" and "update" entries when they don't exist yet in the .git/config and do nothing otherwise. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 June 2011, 20:15:21 UTC
ccee608 Junio C Hamano 25 June 2011, 20:41:25 UTC submodule sync: do not auto-vivify uninteresting submodule Earlier 33f072f (submodule sync: Update "submodule.<name>.url" for empty directories, 2010-10-08) attempted to fix a bug where "git submodule sync" command does not update the URL if the current superproject does not have a checkout of the submodule. However, it did so by unconditionally registering submodule.$name.url to every submodule in the project, even the ones that the user has never showed interest in at all by running 'git submodule init' command. This caused subsequent 'git submodule update' to start cloning/updating submodules that are not interesting to the user at all. Update the code so that the URL is updated from the .gitmodules file only for submodules that already have submodule.$name.url entries, i.e. the ones the user has showed interested in having a checkout. Acked-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 June 2011, 20:06:08 UTC
f696543 Junio C Hamano 26 June 2011, 19:41:16 UTC Git 1.7.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 June 2011, 19:41:16 UTC
568d446 Junio C Hamano 26 June 2011, 19:09:11 UTC Merge branch 'maint' * maint: completion: replace core.abbrevguard to core.abbrev 26 June 2011, 19:09:11 UTC
99ac63b Junio C Hamano 24 June 2011, 16:40:02 UTC Merge branch 'maint-1.7.4' into maint * maint-1.7.4: completion: replace core.abbrevguard to core.abbrev 24 June 2011, 16:40:02 UTC
cdb791f Namhyung Kim 24 June 2011, 06:17:42 UTC completion: replace core.abbrevguard to core.abbrev The core.abbrevguard config variable had removed and now core.abbrev has been used instead. Teach it. Signed-off-by: Namhyung Kim <namhyung@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 June 2011, 16:35:44 UTC
67393c5 Junio C Hamano 23 June 2011, 16:48:49 UTC glossary: clarify description of HEAD HEAD on a branch does reference a commit via the branch ref it refers to. The main difference of a detached HEAD is that it _directly_ refers to a commit. Clarify this. Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 June 2011, 22:39:28 UTC
deaef1e Junio C Hamano 23 June 2011, 16:47:28 UTC glossary: update description of head and ref Reword them to avoid sounding as if loose refs are the only ones in the world. Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 June 2011, 22:39:28 UTC
487b044 Junio C Hamano 23 June 2011, 16:38:48 UTC glossary: update description of "tag" It is an unimportant implementation detail that ref namespaces are implemented as subdirectories of $GIT_DIR/refs. What is more important is that tags are in refs/tags hierarchy in the ref namespace. Also note that a tag can point at an object of arbitrary type, not limited to commit. Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 June 2011, 22:39:24 UTC
back to top