Skip to main content

Browse the archive

https://github.com/git/git
23 July 2024, 09:13:25 UTC
sort by:
Revision Author Date Message Commit Date
92758dd Junio C Hamano 09 May 2013, 19:37:53 UTC Git 1.8.2.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 May 2013, 20:31:17 UTC
07e03d4 Junio C Hamano 09 May 2013, 19:42:17 UTC Merge branch 'tr/copy-revisions-from-stdin' into maint * tr/copy-revisions-from-stdin: read_revisions_from_stdin: make copies for handle_revision_arg 09 May 2013, 19:42:17 UTC
ea2d20d René Scharfe 09 May 2013, 13:13:47 UTC t5004: avoid using tar for checking emptiness of archive Test 2 of t5004 checks if a supposedly empty tar archive really contains no files. 24676f02 (t5004: fix issue with empty archive test and bsdtar) removed our commit hash to make it work with bsdtar, but the test still fails on NetBSD and OpenBSD, which use their own tar that considers a tar file containing only NULs as broken. Here's what the different archivers do when asked to create a tar file without entries: $ uname -v NetBSD 6.0.1 (GENERIC) $ gtar --version | head -1 tar (GNU tar) 1.26 $ bsdtar --version bsdtar 2.8.4 - libarchive 2.8.4 $ : >zero.tar $ perl -e 'print "\0" x 10240' >tenk.tar $ sha1 zero.tar tenk.tar SHA1 (zero.tar) = da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA1 (tenk.tar) = 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c $ : | tar cf - -T - | sha1 da39a3ee5e6b4b0d3255bfef95601890afd80709 $ : | gtar cf - -T - | sha1 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c $ : | bsdtar cf - -T - | sha1 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c So NetBSD's native tar creates an empty file, while GNU tar and bsdtar both give us 10KB of NULs -- just like git archive with an empty tree. Now let's see how the archivers handle these two kinds of empty tar files: $ tar tf zero.tar; echo $? tar: Unexpected EOF on archive file 1 $ gtar tf zero.tar; echo $? gtar: This does not look like a tar archive gtar: Exiting with failure status due to previous errors 2 $ bsdtar tf zero.tar; echo $? 0 $ tar tf tenk.tar; echo $? tar: Cannot identify format. Searching... tar: End of archive volume 1 reached tar: Sorry, unable to determine archive format. 1 $ gtar tf tenk.tar; echo $? 0 $ bsdtar tf tenk.tar; echo $? 0 NetBSD's tar complains about both, bsdtar happily accepts any of them and GNU tar doesn't like zero-length archive files. So the safest course of action is to stay with our block-of-NULs format which is compatible with GNU tar and bsdtar, as we can't make NetBSD's native tar happy anyway. We can simplify our test, however, by taking tar out of the picture. Instead of extracting the archive and checking for the non-presence of files, check if the file has a size of 10KB and contains only NULs. This makes t5004 pass on NetBSD and OpenBSD. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 May 2013, 19:41:31 UTC
abdb9b2 René Scharfe 09 May 2013, 13:10:48 UTC t5004: ignore pax global header file Versions of tar that don't know pax headers -- like the ones in NetBSD 6 and OpenBSD 5.2 -- extract them as regular files. Explicitly ignore the file created for our global header when checking the list of extracted files, as this is normal and harmless fall-back behaviour. This fixes test 3 of t5004 on these platforms. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 May 2013, 19:18:57 UTC
e2161bc David Aguilar 09 May 2013, 09:13:28 UTC mergetools/kdiff3: do not use --auto when diffing The `kdiff3 --auto` help message is, "No GUI if all conflicts are auto- solvable." This flag was carried over from the original mergetool commands. diff_cmd() is for two-way comparisons only so remove the superfluous flag. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 May 2013, 18:59:39 UTC
b120ef3 Felipe Contreras 09 May 2013, 01:16:56 UTC transport-helper: trivial style cleanup Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 May 2013, 18:33:01 UTC
571cdfd Junio C Hamano 03 May 2013, 22:12:38 UTC Merge branch 'tr/remote-tighten-commandline-parsing' into maint * tr/remote-tighten-commandline-parsing: remote: 'show' and 'prune' can take more than one remote remote: check for superfluous arguments in 'git remote add' remote: add a test for extra arguments, according to docs 03 May 2013, 22:12:38 UTC
49010c3 Junio C Hamano 03 May 2013, 22:12:16 UTC Merge branch 'jn/glossary-revision' into maint * jn/glossary-revision: glossary: a revision is just a commit 03 May 2013, 22:12:16 UTC
6606a69 Felipe Contreras 03 May 2013, 21:35:50 UTC completion: zsh: don't override suffix on _detault zsh is smart enough to add the right suffix while completing, there's no point in trying to do the same as bash. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 03 May 2013, 22:10:05 UTC
9a3e36c Anders Granskogen Bjørnstad 02 May 2013, 18:24:15 UTC Documentation/git-commit: Typo under --edit -C takes a commit object, not a file. Signed-off-by: Anders Granskogen Bjørnstad <andersgb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 May 2013, 19:03:40 UTC
8301b97 Junio C Hamano 29 April 2013, 16:52:18 UTC Merge branch 'fc/zsh-completion' into maint * fc/zsh-completion: complete: zsh: use zsh completion for the main cmd complete: zsh: trivial simplification 29 April 2013, 16:52:18 UTC
4911589 Felipe Contreras 27 April 2013, 20:34:06 UTC complete: zsh: use zsh completion for the main cmd So that we can have a nice zsh completion output: % git <tab> add -- add file contents to the index bisect -- find by binary search the change that introduced a bug branch -- list, create, or delete branches checkout -- checkout a branch or paths to the working tree clone -- clone a repository into a new directory commit -- record changes to the repository diff -- show changes between commits, commit and working tree, etc fetch -- download objects and refs from another repository grep -- print lines matching a pattern init -- create an empty Git repository or reinitialize an existing one log -- show commit logs merge -- join two or more development histories together mv -- move or rename a file, a directory, or a symlink pull -- fetch from and merge with another repository or a local branch push -- update remote refs along with associated objects rebase -- forward-port local commits to the updated upstream head reset -- reset current HEAD to the specified state rm -- remove files from the working tree and from the index show -- show various types of objects status -- show the working tree status tag -- create, list, delete or verify a tag object signed with GPG And other niceties, like 'git --git-dir=<tab>' showing only directories. For the rest, the bash completion stuff is still used. Also, add my copyright, since this more than a thin wrapper. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 April 2013, 16:52:06 UTC
1ca6d4b Felipe Contreras 27 April 2013, 20:34:05 UTC complete: zsh: trivial simplification There should be no functional changes. The only reason I wrapped this code around a sub-function is because zsh did the same in it's bashcompinit script in order to declare the special variable 'words' as hidden, but only in this context. There's no need for that any more since we access __git_main directly, so 'words' is not modified, so there's no need for the sub-function. In zsh mode the array indexes are different though. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 April 2013, 16:52:06 UTC
a05490e Ramkumar Ramachandra 29 April 2013, 12:49:39 UTC git-completion.bash: complete branch.*.rebase as boolean 6fac1b83 (completion: add missing config variables, 2009-06-29) added "rebase" to the list of completions for "branch.*.*", but forgot to specify completions for the values that this configuration variable can take (namely "false" and "true"). Fix this. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 April 2013, 15:07:23 UTC
2651baa Ramkumar Ramachandra 29 April 2013, 12:49:38 UTC git-completion.bash: add diff.submodule to config list c47ef57 (diff: introduce diff.submodule configuration variable, 2012-11-13) introduced the diff.submodule configuration variable, but forgot to teach git-completion.bash about it. Fix this. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 April 2013, 15:07:23 UTC
de7c201 Ramkumar Ramachandra 29 April 2013, 12:49:37 UTC git-completion.bash: lexical sorting for diff.statGraphWidth df44483a (diff --stat: add config option to limit graph width, 2012-03-01) added the option diff.startGraphWidth to the list of configuration variables in git-completion.bash, but failed to notice that the list is sorted alphabetically. Move it to its rightful place in the list. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 April 2013, 15:07:22 UTC
240ae2b Felipe Contreras 27 April 2013, 22:00:07 UTC documentation: trivial whitespace cleanups Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 April 2013, 21:46:52 UTC
6a776ac John Keeping 26 April 2013, 17:58:24 UTC t/Makefile: remove smoke test targets Commit d24fbca (Remove Git's support for smoke testing - 2011-12-23) removed the smoke test support from the test suite but it was re-added by commit 342e9ef (Introduce a performance testing framework - 2012-02-17). This appears to be the result of a mis-rebase, since re-adding the smoke testing infrastructure does not relate to the subject of that commit. The current 'smoke' target is broken since the 'harness' script it uses no longer exists, so just reapply this section of commit d24fbca and remove all of the smoke testing section in the makefile. Signed-off-by: John Keeping <john@keeping.me.uk> Acked-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 April 2013, 21:04:41 UTC
4a9a4f0 Junio C Hamano 26 April 2013, 18:30:08 UTC Git 1.8.2.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 April 2013, 19:59:36 UTC
7a011aa Junio C Hamano 26 April 2013, 18:25:59 UTC Merge branch 'jk/a-thread-only-dies-once' into maint * jk/a-thread-only-dies-once: run-command: use thread-aware die_is_recursing routine usage: allow pluggable die-recursion checks 26 April 2013, 18:25:59 UTC
40a9c3c Junio C Hamano 26 April 2013, 18:12:48 UTC Merge branch 'jn/gitweb-install-doc' into maint * jn/gitweb-install-doc: gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM 26 April 2013, 18:12:48 UTC
1a475c4 Junio C Hamano 26 April 2013, 18:12:30 UTC Merge branch 'fc/untracked-zsh-prompt' into maint * fc/untracked-zsh-prompt: prompt: fix untracked files for zsh 26 April 2013, 18:12:30 UTC
bd8e338 Junio C Hamano 26 April 2013, 18:12:17 UTC Merge branch 'jk/receive-pack-deadlocks-with-early-failure' into maint * jk/receive-pack-deadlocks-with-early-failure: receive-pack: close sideband fd on early pack errors 26 April 2013, 18:12:17 UTC
30e8180 Junio C Hamano 26 April 2013, 18:11:51 UTC Merge branch 'jk/chopped-ident' into maint * jk/chopped-ident: blame: handle broken commit headers gracefully pretty: handle broken commit headers gracefully cat-file: print tags raw for "cat-file -p" 26 April 2013, 18:11:51 UTC
0222bc9 Junio C Hamano 26 April 2013, 18:10:47 UTC Merge branch 'rt/commentchar-fmt-merge-msg' into maint * rt/commentchar-fmt-merge-msg: t6200: avoid path mangling issue on Windows fmt-merge-msg: use core.commentchar in tag signatures completely fmt-merge-msg: respect core.commentchar in people credits 26 April 2013, 18:10:47 UTC
167843f Junio C Hamano 26 April 2013, 18:03:31 UTC Merge branch 'rs/empty-archive' into maint * rs/empty-archive: t5004: fix issue with empty archive test and bsdtar 26 April 2013, 18:03:31 UTC
bcd6608 Junio C Hamano 26 April 2013, 18:00:14 UTC Merge branch 'pe/pull-rebase-v-q' into maint * pe/pull-rebase-v-q: pull: Apply -q and -v options to rebase mode as well 26 April 2013, 18:00:14 UTC
a8addfe Torsten Bögershausen 26 April 2013, 09:18:28 UTC t7409: do not use export X=Y The shell syntax "export X=Y A=B" is not understood by all shells. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 April 2013, 16:54:31 UTC
86c5e14 Torsten Bögershausen 26 April 2013, 09:17:43 UTC test-hg-hg-git.sh: do not use export X=Y The shell syntax "export X=Y" is not understood by all shells. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 April 2013, 16:53:52 UTC
93cd8d9 Torsten Bögershausen 26 April 2013, 09:17:56 UTC test-hg-bidi.sh: do not use export X=Y The shell syntax "export X=Y A=B" is not understood by all shells. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 April 2013, 16:53:31 UTC
d87ec81 Torsten Bögershausen 26 April 2013, 09:18:07 UTC t9501: do not use export X=Y The shell syntax "export X=Y" is not understood by all shells. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 April 2013, 16:52:41 UTC
56291c1 Torsten Bögershausen 26 April 2013, 09:18:16 UTC t9020: do not use export X=Y The shell syntax "export X=Y" is not understood by all shells. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 April 2013, 16:52:11 UTC
173f9a7 Junio C Hamano 24 April 2013, 23:22:07 UTC Update draft release notes to 1.8.2.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 April 2013, 23:22:07 UTC
e4d1595 Junio C Hamano 24 April 2013, 23:17:13 UTC Merge branch 'jk/diff-algo-finishing-touches' into maint "git diff --diff-algorithm=algo" was understood by the command line parser, but "git diff --diff-algorithm algo" was not. * jk/diff-algo-finishing-touches: diff: allow unstuck arguments with --diff-algorithm git-merge(1): document diff-algorithm option to merge-recursive 24 April 2013, 23:19:42 UTC
283c63f Junio C Hamano 24 April 2013, 23:15:44 UTC Merge branch 'sr/log-SG-no-textconv' into maint "git log -S/-G" started paying attention to textconv filter, but there was no way to disable this. Make it honor --no-textconv option. * sr/log-SG-no-textconv: diffcore-pickaxe: unify code for log -S/-G diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>" diffcore-pickaxe: port optimization from has_changes() to diff_grep() diffcore-pickaxe: respect --no-textconv diffcore-pickaxe: remove fill_one() diffcore-pickaxe: remove unnecessary call to get_textconv() 24 April 2013, 23:15:44 UTC
499231d Junio C Hamano 24 April 2013, 23:14:06 UTC Merge branch 'jc/merge-tag-object' into maint "git merge $(git rev-parse v1.8.2)" behaved quite differently from "git merge v1.8.2", as if v1.8.2 were written as v1.8.2^0 and did not pay much attention to the annotated tag payload. Make the code notice the type of the tag object, in addition to the dwim_ref() based classification the current code uses (i.e. the name appears in refs/tags/) to decide when to special case merging of tags. * jc/merge-tag-object: t6200: test message for merging of an annotated tag t6200: use test_config/test_unconfig merge: a random object may not necssarily be a commit 24 April 2013, 23:14:06 UTC
7612e61 Mårten Kongstad 24 April 2013, 20:49:06 UTC completion: remove duplicate block for "git commit -c" Remove one of two consecutive, identical blocks for "git commit -c". This was caused by a mechanical mismerge at d931e2fb252e (Merge branch 'mp/complete-paths', 2013-02-08). The side branch wanted to add this block at fea16b47 but the same fix was done independently at 685397585 already. Signed-off-by: Mårten Kongstad <marten.kongstad@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 April 2013, 23:05:07 UTC
b17dd3f Thomas Rast 24 April 2013, 13:54:37 UTC remote: 'show' and 'prune' can take more than one remote The 'git remote show' and 'prune' subcommands are documented as taking only a single remote name argument, but that is not the case; they will simply iterate the action over all remotes given. Update the documentation and tests to match. With the last user of the -f flag gone, we also remove the code supporting it. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 April 2013, 20:13:21 UTC
2d2e3d2 Thomas Rast 24 April 2013, 13:54:36 UTC remote: check for superfluous arguments in 'git remote add' The 'git remote add' subcommand did not check for superfluous command line arguments. Make it so. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 April 2013, 20:12:51 UTC
abf5f87 Thomas Rast 24 April 2013, 13:54:35 UTC remote: add a test for extra arguments, according to docs This adds one test or comment for each subcommand of git-remote according to its current documentation. All but 'set-branches' and 'update' are listed as taking only a fixed number of arguments; for those we can write a test with one more (bogus) argument, and see if the command notices that. They fail on several counts: 'add' does not check for extra arguments, and 'show' and 'prune' actually iterate over remotes (i.e., take any number of args). We'll fix them in the next two patches. The -f machinery is only there to make the tests readable while still ensuring they pass as a whole, and will be removed in the final patch. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 April 2013, 20:12:48 UTC
2130bf3 Kevin Bracey 22 April 2013, 15:57:37 UTC cherry-pick/revert: make usage say '<commit-ish>...' The usage string for cherry-pick and revert has never been updated to reflect their ability to handle multiple commits. Other documentation is already correct. Signed-off-by: Kevin Bracey <kevin@bracey.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 April 2013, 16:48:01 UTC
3e7bb5d Junio C Hamano 22 April 2013, 18:32:58 UTC Start preparing for 1.8.2.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 April 2013, 18:32:58 UTC
76f9bc9 Junio C Hamano 22 April 2013, 18:26:58 UTC Merge branch 'ta/glossary' into maint * ta/glossary: glossary: improve definitions of refspec and pathspec The name of the hash function is "SHA-1", not "SHA1" glossary: improve description of SHA-1 related topics glossary: remove outdated/misleading/irrelevant entries 22 April 2013, 18:26:58 UTC
56303b8 Junio C Hamano 22 April 2013, 18:26:58 UTC Merge branch 'jk/doc-http-backend' into maint Improve documentation to illustrate "push authenticated, fetch anonymous" configuration for smart HTTP servers. * jk/doc-http-backend: doc/http-backend: match query-string in apache half-auth example doc/http-backend: give some lighttpd config examples doc/http-backend: clarify "half-auth" repo configuration 22 April 2013, 18:26:58 UTC
ac85caa Junio C Hamano 22 April 2013, 18:26:58 UTC Merge branch 'jk/test-trash' into maint * jk/test-trash: t/test-lib.sh: drop "$test" variable t/test-lib.sh: fix TRASH_DIRECTORY handling 22 April 2013, 18:26:58 UTC
34ab7fc Junio C Hamano 22 April 2013, 18:26:58 UTC Merge branch 'jk/daemon-user-doc' into maint * jk/daemon-user-doc: doc: clarify that "git daemon --user=<user>" option does not export HOME=~user 22 April 2013, 18:26:58 UTC
be9d07f Junio C Hamano 22 April 2013, 18:26:57 UTC Merge branch 'jc/detached-head-doc' into maint * jc/detached-head-doc: glossary: extend "detached HEAD" description Conflicts: Documentation/glossary-content.txt 22 April 2013, 18:26:57 UTC
4fe3ed1 Junio C Hamano 22 April 2013, 18:26:57 UTC Merge branch 'jk/show-branch-strbuf' into maint * jk/show-branch-strbuf: show-branch: use strbuf instead of static buffer 22 April 2013, 18:26:57 UTC
63a4d8d Junio C Hamano 22 April 2013, 18:26:56 UTC Merge branch 'js/rerere-forget-protect-against-NUL' into maint * js/rerere-forget-protect-against-NUL: rerere forget: do not segfault if not all stages are present rerere forget: grok files containing NUL 22 April 2013, 18:26:56 UTC
2124745 Junio C Hamano 22 April 2013, 18:26:56 UTC Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint * jc/apply-ws-fix-tab-in-indent: test: resurrect q_to_tab apply --whitespace=fix: avoid running over the postimage buffer 22 April 2013, 18:26:56 UTC
2c697a6 Junio C Hamano 22 April 2013, 18:26:56 UTC Merge branch 'ap/combine-diff-ignore-whitespace' into maint * ap/combine-diff-ignore-whitespace: Allow combined diff to ignore white-spaces 22 April 2013, 18:26:56 UTC
4aaafdc Junio C Hamano 22 April 2013, 18:26:55 UTC Merge branch 'jk/suppress-clang-warning' into maint * jk/suppress-clang-warning: fix clang -Wtautological-compare with unsigned enum 22 April 2013, 18:26:55 UTC
2483fba Junio C Hamano 22 April 2013, 18:26:55 UTC Merge branch 'tr/perl-keep-stderr-open' into maint * tr/perl-keep-stderr-open: t9700: do not close STDERR perl: redirect stderr to /dev/null instead of closing 22 April 2013, 18:26:55 UTC
2903c28 Junio C Hamano 22 April 2013, 18:26:55 UTC Merge branch 'lf/bundle-with-tip-wo-message' into maint * lf/bundle-with-tip-wo-message: bundle: Accept prerequisites without commit messages 22 April 2013, 18:26:55 UTC
13e1108 Junio C Hamano 22 April 2013, 18:26:55 UTC Merge branch 'jk/filter-branch-come-back-to-original' into maint * jk/filter-branch-come-back-to-original: filter-branch: return to original dir after filtering 22 April 2013, 18:26:55 UTC
ad62fd0 Junio C Hamano 22 April 2013, 18:26:54 UTC Merge branch 'rr/prompt-revert-head' into maint * rr/prompt-revert-head: bash: teach __git_ps1 about REVERT_HEAD 22 April 2013, 18:26:54 UTC
dfb4410 Jonathan Nieder 21 April 2013, 08:17:05 UTC glossary: a revision is just a commit The current definition of 'revision' sounds like it is saying that a revision is a tree object. In reality it is just a commit. This should be especially useful for people used to other revision control systems trying to see how familiar concepts translate into git terms. Reported-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 April 2013, 01:53:59 UTC
24b6132 Felipe Contreras 21 April 2013, 22:00:16 UTC prompt: fix untracked files for zsh We signal presense of untracked files by adding a per-cent sign '%' to the prompt. But because '%' is used as an escape character to introduce prompt customization in zsh (just like bash prompt uses '\' to escape '\u', '\h', etc.), we need to say '%%' to get a literal per-cent. Helped-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 April 2013, 01:01:37 UTC
49ecfa1 Jeff King 19 April 2013, 21:24:29 UTC receive-pack: close sideband fd on early pack errors Since commit a22e6f8 (receive-pack: send pack-processing stderr over sideband, 2012-09-21), receive-pack will start an async sideband thread to copy the stderr from our index-pack or unpack-objects child to the client. We hand the thread's input descriptor to unpack(), which puts it in the "err" member of the "struct child_process". After unpack() returns, we use finish_async() to reap the sideband thread. The thread is only ready to die when it gets EOF on its pipe, which is connected to the err descriptor. So we expect all of the write ends of that pipe to be closed as part of unpack(). Normally, this works fine. After start_command forks, it closes the parent copy of the descriptor. Then once the child exits (whether it was successful or not), that closes the only remaining writer. However, there is one code-path in unpack() that does not handle this. Before we decide which of unpack-objects or index-pack to use, we read the pack header ourselves to see how many objects it contains. If there is an error here, we exit without running either sub-command, the pipe descriptor remains open, and we are in a deadlock, waiting for the sideband thread to die (which is in turn waiting for us to close the pipe). We can fix this by making sure that unpack() always closes the pipe before returning. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 April 2013, 21:43:24 UTC
16a794d Johannes Sixt 18 April 2013, 06:42:25 UTC t6200: avoid path mangling issue on Windows MSYS bash interprets the slash in the argument core.commentchar="/" as root directory and mangles it into a Windows style path. Use a different core.commentchar to dodge the issue. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 April 2013, 16:56:37 UTC
845241d Felipe Contreras 18 April 2013, 06:06:31 UTC remote-hg: fix commit messages git fast-import expects an extra newline after the commit message data, but we are adding it only on hg-git compat mode, which is why the bidirectionality tests pass. We should add it unconditionally. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 April 2013, 06:41:25 UTC
1a39b72 Jonathan Nieder 16 April 2013, 22:26:00 UTC gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility Highlight that CONFIG_SYSTEM and /etc/gitweb.conf are meant to be the fallback configuration file in BUGS section of gitweb.conf documentation. This will hopefully help people who expect them to be a common default, which unfortunately came later in the history. 17 April 2013, 22:18:12 UTC
de5abe9 René Scharfe 17 April 2013, 18:33:54 UTC blame: handle broken commit headers gracefully split_ident_line() can leave us with the pointers date_begin, date_end, tz_begin and tz_end all set to NULL. Check them before use and supply the same fallback values as in the case of a negative return code from split_ident_line(). The "(unknown)" is not actually shown in the output, though, because it will be converted to a number (zero) eventually. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 April 2013, 21:50:45 UTC
9dbe7c3 René Scharfe 17 April 2013, 18:33:35 UTC pretty: handle broken commit headers gracefully Centralize the parsing of the date and time zone strings in the new helper function show_ident_date() and make sure it checks the pointers provided by split_ident_line() for NULL before use. Reported-by: Ivan Lyapunov <dront78@gmail.com> Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 April 2013, 21:50:36 UTC
9cfa512 Jeff King 17 April 2013, 21:00:48 UTC cat-file: print tags raw for "cat-file -p" When "cat-file -p" prints commits, it shows them in their raw format, since git's format is already human-readable. For tags, however, we print the whole thing raw except for one thing: we convert the timestamp on the tagger line into a human-readable date. This dates all the way back to a0f15fa (Pretty-print tagger dates, 2006-03-01). At that time there was no other way to pretty-print a tag. These days, however, neither of those matters much. The normal way to pretty-print a tag is with "git show", which is much more flexible than "cat-file -p". Commit a0f15fa also built "verify-tag --verbose" (and subsequently "tag -v") around the "cat-file -p" output. However, that behavior was lost in commit 62e09ce (Make git tag a builtin, 2007-07-20), and we went back to printing the raw tag contents. Nobody seems to have noticed the bug since then (and it is arguably a saner behavior anyway, as it shows the actual bytes for which we verified the signature). Let's drop the tagger-date formatting for "cat-file -p". It makes us more consistent with cat-file's commit pretty-printer, and as a bonus, we can drop the hand-rolled tag parsing code in cat-file (which happened to behave inconsistently with the tag pretty-printing code elsewhere). This is a change of output format, so it's possible that some callers could considered this a regression. However, the original behavior was arguably a bug (due to the inconsistency with commits), likely nobody was relying on it (even we do not use it ourselves these days), and anyone relying on the "-p" pretty-printer should be able to expect a change in the output format (i.e., while "cat-file" is plumbing, the output format of "-p" was never guaranteed to be stable). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 April 2013, 21:48:45 UTC
1ece66b Jeff King 16 April 2013, 19:50:07 UTC run-command: use thread-aware die_is_recursing routine If we die from an async thread, we do not actually exit the program, but just kill the thread. This confuses the static counter in usage.c's default die_is_recursing function; it updates the counter once for the thread death, and then when the main program calls die() itself, it erroneously thinks we are recursing. The end result is that we print "recursion detected in die handler" instead of the real error in such a case (the easiest way to trigger this is having a remote connection hang up while running a sideband demultiplexer). This patch solves it by using a per-thread counter when the async_die function is installed; we detect recursion in each thread (including the main one), but they do not step on each other's toes. Other threaded code does not need to worry about this, as they do not install specialized die handlers; they just let a die() from a sub-thread take down the whole program. Since we are overriding the default recursion-check function, there is an interesting corner case that is not a problem, but bears some explanation. Imagine the main thread calls die(), and then in the die_routine starts an async call. We will switch to using thread-local storage, which starts at 0, for the main thread's counter, even though the original counter was actually at 1. That's OK, though, for two reasons: 1. It would miss only the first level of recursion, and would still find recursive failures inside the async helper. 2. We do not currently and are not likely to start doing anything as heavyweight as starting an async routine from within a die routine or helper function. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 April 2013, 22:02:48 UTC
c19a490 Jeff King 16 April 2013, 19:46:22 UTC usage: allow pluggable die-recursion checks When any git code calls die or die_errno, we use a counter to detect recursion into the die functions from any of the helper functions. However, such a simple counter is not good enough for threaded programs, which may call die from a sub-thread, killing only the sub-thread (but incrementing the counter for everyone). Rather than try to deal with threads ourselves here, let's just allow callers to plug in their own recursion-detection function. This is similar to how we handle the die routine (the caller plugs in a die routine which may kill only the sub-thread). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 April 2013, 22:02:46 UTC
f2de0b9 David Aguilar 16 April 2013, 20:33:25 UTC help.c: add a compatibility comment to cmd_version() External projects have been known to parse the output of "git version". Help prevent future authors from changing its format by adding a comment to its implementation. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 April 2013, 22:01:30 UTC
70d26c6 Thomas Rast 16 April 2013, 09:57:45 UTC read_revisions_from_stdin: make copies for handle_revision_arg read_revisions_from_stdin() has passed pointers to its read buffer down to handle_revision_arg() since its inception way back in 42cabc3 (Teach rev-list an option to read revs from the standard input., 2006-09-05). Even back then, this was a bug: through add_pending_object, the argument was recorded in the object_array's 'name' field. Fix it by making a copy whenever read_revisions_from_stdin() passes an argument down the callchain. The other caller runs handle_revision_arg() on argv[], where it would be redundant to make a copy. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 April 2013, 18:17:48 UTC
57148eb Thomas Ackermann 15 April 2013, 17:50:07 UTC glossary: improve definitions of refspec and pathspec The exact definition of "refspec" can be found in git-fetch and git-push manpages. So don't duplicate this here in the glossary. Actually the definition of "pathspec" should be moved to a separate file akin to the way it's done with "refspec". But this will only be wortwhile when there's more to say about it. So for the time being just improve the first sentence a little bit; fix the indentation of the first paragraph after the bullet list and remove the one-item list of magic signatures with its - for the user - unnecessary introduction of "magic word 'top'". Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 April 2013, 18:10:36 UTC
d5fa1f1 Thomas Ackermann 15 April 2013, 17:49:04 UTC The name of the hash function is "SHA-1", not "SHA1" Use "SHA-1" instead of "SHA1" whenever we talk about the hash function. When used as a programming symbol, we keep "SHA1". Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 April 2013, 18:08:37 UTC
3ab5012 Thomas Ackermann 15 April 2013, 17:47:50 UTC glossary: improve description of SHA-1 related topics The name of the hash function is "SHA-1", not "SHA1". Also to people who look up "object name" in the glossary, the details of which hash function is applied on what to compute "object name" is not important but the fact that the name is meant to be an unique identifier for the contents stored in the object is. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 April 2013, 18:06:15 UTC
79de455 Thomas Ackermann 15 April 2013, 17:46:56 UTC glossary: remove outdated/misleading/irrelevant entries Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 April 2013, 18:04:52 UTC
0d2f7d1 Jakub Narębski 12 April 2013, 22:20:48 UTC gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM The flow of the text describing GITWEB_CONFIG_SYSTEM and GITWEB_CONFIG_COMMON in gitweb/INSTALL is awkward. "This is bad. Oh the other hand, better is broken. Therefore we do this." forces readers to make multiple guesses while reading: "ok, bad, so you plan to change it and warn us about upcoming change? oh, not that, changing it is bad, so we have to live with it? oh, not that, there is another one that is common and that is what we can use". Better rewrite said paragraph to avoid such a mental roller-coaster in the first place. Signed-off-by: Junio Hamano <gitster@pobox.com> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 April 2013, 14:25:46 UTC
002d4ce Jeff King 14 April 2013, 19:38:21 UTC t/test-lib.sh: drop "$test" variable The $test variable is used as an interim buffer for constructing $TRASH_DIRECTORY, and is almost compatible with it (the exception being that $test has not been converted to an absolute path). Let's get rid of it entirely so that later code does not accidentally use it, thinking the two are interchangeable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 April 2013, 06:30:57 UTC
38b074d John Keeping 14 April 2013, 16:34:56 UTC t/test-lib.sh: fix TRASH_DIRECTORY handling After the location of $TRASH_DIRECTORY is adjusted by $TEST_OUTPUT_DIRECTORY, we go on to use the $test variable to make the trash directory and cd into it. This means that when $TEST_OUTPUT_DIRECTORY is not "." and an absolute --root has not been specified, we do not remove the trash directory once the tests are complete (remove_trash is set to $TRASH_DIRECTORY). Fix this by always referring to the trash directory as $TRASH_DIRECTORY. Signed-off-by: John Keeping <john@keeping.me.uk> Acked-by: Jeff King <peff@peff.net> Acked-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 April 2013, 06:30:21 UTC
b080881 Jeff King 13 April 2013, 03:33:36 UTC doc/http-backend: match query-string in apache half-auth example When setting up a "half-auth" repository in which reads can be done anonymously but writes require authentication, it is best if the server can require authentication for both the ref advertisement and the actual receive-pack POSTs. This alleviates the need for the admin to set http.receivepack in the repositories, and means that the client is challenged for credentials immediately, instead of partway through the push process (and git clients older than v1.7.11.7 had trouble handling these challenges). Since detecting a push during the ref advertisement requires matching the query string, and this is non-trivial to do in Apache, we have traditionally punted and instructed users to just protect "/git-receive-pack$". This patch provides the mod_rewrite recipe to actually match the ref advertisement, which is preferred. While we're at it, let's add the recipe to our test scripts so that we can be sure that it works, and doesn't get broken (either by our changes or by changes in Apache). Signed-off-by: Jeff King <peff@peff.net> Acked-by: Jakub Narębski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 April 2013, 05:27:06 UTC
a46221e Junio C Hamano 12 April 2013, 20:41:48 UTC Merge branch 'rr/test-3200-style' into maint * rr/test-3200-style: t3200 (branch): modernize style Conflicts: t/t3200-branch.sh 12 April 2013, 20:41:48 UTC
97ff97d Junio C Hamano 12 April 2013, 20:41:48 UTC Merge branch 'mg/texinfo-5' into maint * mg/texinfo-5: Documentation: Strip texinfo anchors to avoid duplicates 12 April 2013, 20:41:48 UTC
15af30e Junio C Hamano 12 April 2013, 20:41:47 UTC Merge branch 'jk/diffcore-break-divzero' into maint * jk/diffcore-break-divzero: diffcore-break: don't divide by zero 12 April 2013, 20:41:47 UTC
788e98f Junio C Hamano 12 April 2013, 20:41:47 UTC Merge branch 'cn/commit-amend-doc' into maint * cn/commit-amend-doc: Documentation/git-commit: reword the --amend explanation 12 April 2013, 20:41:47 UTC
23589a9 Junio C Hamano 12 April 2013, 20:41:46 UTC Merge branch 'jk/bisect-prn-unsigned' into maint * jk/bisect-prn-unsigned: bisect: avoid signed integer overflow 12 April 2013, 20:41:46 UTC
cd12104 Junio C Hamano 12 April 2013, 20:41:46 UTC Merge branch 'jk/no-more-self-assignment' into maint * jk/no-more-self-assignment: match-trees: simplify score_trees() using tree_entry() submodule: clarify logic in show_submodule_summary 12 April 2013, 20:41:46 UTC
b5581e6 Junio C Hamano 12 April 2013, 20:41:46 UTC Merge branch 'rr/send-email-perl-critique' into maint * rr/send-email-perl-critique: send-email: use the three-arg form of open in recipients_cmd send-email: drop misleading function prototype send-email: use "return;" not "return undef;" on error codepaths 12 April 2013, 20:41:46 UTC
6a29370 Junio C Hamano 12 April 2013, 20:41:45 UTC Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' into maint * jc/t5516-pushInsteadOf-vs-pushURL: t5516: test interaction between pushURL and pushInsteadOf correctly 12 April 2013, 20:41:45 UTC
41ccfdd Stefano Lattarini 11 April 2013, 22:36:10 UTC Correct common spelling mistakes in comments and tests Most of these were found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 April 2013, 20:38:40 UTC
2fec81c Stefano Lattarini 11 April 2013, 22:36:10 UTC kwset: fix spelling in comments Correct spelling mistakes noticed using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 April 2013, 19:25:08 UTC
0f7b4c2 Stefano Lattarini 11 April 2013, 22:36:10 UTC precompose-utf8: fix spelling of "want" in error message Noticed using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 April 2013, 19:24:04 UTC
4283b8e Stefano Lattarini 11 April 2013, 22:36:10 UTC compat/nedmalloc: fix spelling in comments Correct some typos found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 April 2013, 19:23:58 UTC
ce9171c Stefano Lattarini 11 April 2013, 22:36:10 UTC compat/regex: fix spelling and grammar in comments Some of these were found using Lucas De Marchi's codespell tool. Others noticed by Eric Sunshine. Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 April 2013, 19:23:44 UTC
7323513 Stefano Lattarini 11 April 2013, 22:36:10 UTC obstack: fix spelling of similar Noticed using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 April 2013, 19:23:20 UTC
d0008b3 Stefano Lattarini 11 April 2013, 22:36:10 UTC contrib/subtree: fix spelling of accidentally Noticed with Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 April 2013, 19:23:12 UTC
2582ab1 Stefano Lattarini 11 April 2013, 22:36:10 UTC git-remote-mediawiki: spelling fixes Most of these were found using Lucas De Marchi's codespell tool. Others were pointed out by Eric Sunshine. Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 April 2013, 19:13:05 UTC
e1c3bf4 Stefano Lattarini 11 April 2013, 22:36:10 UTC doc: various spelling fixes Most of these were found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 April 2013, 19:00:52 UTC
7f20008 Junio C Hamano 12 April 2013, 18:48:38 UTC Merge branch 'maint-1.8.1' into maint * maint-1.8.1: fast-export: fix argument name in error messages Documentation: distinguish between ref and offset deltas in pack-format 12 April 2013, 18:48:38 UTC
714d258 Junio C Hamano 12 April 2013, 16:08:31 UTC doc: clarify that "git daemon --user=<user>" option does not export HOME=~user The fact that we don't set $HOME may confuse admins who expect ~<user>/.gitconfig to be used, because that is not what we try to read. And worse, since 96b9e0e3, a git-daemon started by root is likely to fail to run at all, as the user we switch to generally cannot read ~root. Signed-off-by: Jeff King <peff@peff.net> Helped-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 April 2013, 17:29:06 UTC
04a74b6 Paul Price 12 April 2013, 14:05:55 UTC fast-export: fix argument name in error messages The --signed-tags argument is plural, while error messages referred to --signed-tag (singular). Tweak error messages to correspond to the argument. Signed-off-by: Paul Price <price@astro.princeton.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 April 2013, 16:48:46 UTC
06cb843 Stefan Saasen 12 April 2013, 05:56:24 UTC Documentation: distinguish between ref and offset deltas in pack-format eb32d236 introduced the OBJ_OFS_DELTA object that uses a relative offset to identify the base object instead of the 20-byte SHA1 reference. The pack file documentation only mentions the SHA1 based reference in its description of the deltified object entry. Update the pack format documentation to clarify that the deltified object representation refers to its base using either a relative negative offset or the absolute SHA1 identifier. Signed-off-by: Stefan Saasen <ssaasen@atlassian.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 April 2013, 16:14:01 UTC
5234b41 Junio C Hamano 12 April 2013, 15:12:47 UTC Merge branch 'tb/document-status-u-tradeoff' into maint * tb/document-status-u-tradeoff: i18n: make the translation of -u advice in one go 12 April 2013, 15:12:47 UTC
6290117 Jiang Xin 12 April 2013, 03:53:01 UTC i18n: make the translation of -u advice in one go The advice (consider use of -u when read_directory takes too long) is separated into 3 different status_printf_ln() calls, and which brings trouble for translators. Since status_vprintf() called by status_printf_ln() can handle eol in buffer, we could simply join these lines into one paragraph. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 April 2013, 15:11:20 UTC
back to top