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
5f8937d Junio C Hamano 26 May 2011, 16:41:11 UTC Merge branch 'mg/diff-uiconfig-doc' into maint * mg/diff-uiconfig-doc: config.txt,diff-options.txt: porcelain vs. plumbing for color.diff 26 May 2011, 16:41:11 UTC
b73f3d2 Junio C Hamano 26 May 2011, 16:40:50 UTC Merge branch 'ft/gitweb-tar-with-gzip-n' into maint * ft/gitweb-tar-with-gzip-n: gitweb: supply '-n' to gzip for identical output 26 May 2011, 16:40:50 UTC
7eacaef Junio C Hamano 26 May 2011, 16:39:40 UTC Merge branch 'ss/doc-svn' into maint * ss/doc-svn: remove noise and inaccuracies from git-svn docs 26 May 2011, 16:39:40 UTC
63c11eb Junio C Hamano 26 May 2011, 16:39:33 UTC Merge branch 'jn/format-patch-doc' into maint * jn/format-patch-doc: Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird Documentation: publicize hints for sending patches with GMail Documentation: publicize KMail hints for sending patches inline Documentation: hints for sending patches inline with Thunderbird Documentation: explain how to check for patch corruption 26 May 2011, 16:39:33 UTC
ea8ec09 Junio C Hamano 26 May 2011, 16:38:44 UTC Merge branch 'jc/maint-pathspec-stdin-and-cmdline' into maint * jc/maint-pathspec-stdin-and-cmdline: setup_revisions(): take pathspec from command line and --stdin correctly 26 May 2011, 16:38:44 UTC
0e66f87 Junio C Hamano 26 May 2011, 16:37:41 UTC Merge branch 'jk/cherry-pick-root-with-resolve' into maint * jk/cherry-pick-root-with-resolve: t3503: test cherry picking and reverting root commits revert: allow reverting a root commit cherry-pick: handle root commits with external strategies 26 May 2011, 16:37:41 UTC
93446aa Junio C Hamano 26 May 2011, 16:37:04 UTC Merge branch 'rg/copy-gecos-username' into maint * rg/copy-gecos-username: copy_gecos: fix not adding nlen to len when processing "&" 26 May 2011, 16:37:04 UTC
9e0ec12 Junio C Hamano 26 May 2011, 16:36:33 UTC Merge branch 'fc/completion-zsh' into maint * fc/completion-zsh: git-completion: fix regression in zsh support 26 May 2011, 16:36:33 UTC
5590fe7 Junio C Hamano 26 May 2011, 16:33:25 UTC Merge branch 'jk/git-connection-deadlock-fix' into maint * jk/git-connection-deadlock-fix: test core.gitproxy configuration send-pack: avoid deadlock on git:// push with failed pack-objects connect: let callers know if connection is a socket connect: treat generic proxy processes like ssh processes Conflicts: connect.c 26 May 2011, 16:33:25 UTC
f09937d Junio C Hamano 26 May 2011, 16:32:14 UTC Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint * js/maint-send-pack-stateless-rpc-deadlock-fix: sideband_demux(): fix decl-after-stmt send-pack: unbreak push over stateless rpc send-pack: avoid deadlock when pack-object dies early 26 May 2011, 16:32:14 UTC
46bf76a Junio C Hamano 26 May 2011, 15:52:11 UTC Merge branch 'svn-fe-maint' of git://repo.or.cz/git/jrn into maint * 'svn-fe-maint' of git://repo.or.cz/git/jrn: Revert "t0081 (line-buffer): add buffering tests" 26 May 2011, 15:52:11 UTC
09ffc70 Nguyen Thai Ngoc Duy 24 May 2011, 16:40:32 UTC init/clone: remove short option -L and document --separate-git-dir Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 May 2011, 16:30:26 UTC
9963e02 Michael J Gruber 20 May 2011, 11:16:34 UTC git-svn: Fix git svn log --show-commit git svn log --show-commit had no tests and, consequently, no attention by the author of b1b4755 (git-log: put space after commit mark, 2011-03-10) who kept git svn log working only without --show-commit. Introduce a test and fix it. Reported-by: Bernt Hansen <bernt@norang.ca> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 May 2011, 16:30:09 UTC
3d5ae43 Junio C Hamano 20 May 2011, 03:30:44 UTC Git 1.7.5.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 May 2011, 03:30:44 UTC
36268b7 Jonathan Nieder 19 May 2011, 15:14:25 UTC provide a copy of the LGPLv2.1 The LGPL seems to require providing a copy of the license when distributing xdiff, compat/fnmatch, and so on, or altering the license notices to refer to the GPL intead. Since we don't want to do the latter, let's do the former. It's nice to let people know their rights anyway. Inspired-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 May 2011, 01:23:17 UTC
c7730e6 Jeff King 18 May 2011, 08:57:44 UTC test core.gitproxy configuration This is just a basic sanity test to see whether core.gitproxy works at all. Until now, we were not testing anywhere. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 May 2011, 19:52:00 UTC
c0336ff Rafael Gieschke 16 May 2011, 20:08:21 UTC copy_gecos: fix not adding nlen to len when processing "&" nlen has to be added to len when inserting (capitalized) pw_name as substitution for "&" in pw_gecos. Otherwise, pw_gecos will be truncated and data might be written beyond name+sz. Signed-off-by: Rafael Gieschke <rafael@gieschke.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 May 2011, 04:27:19 UTC
1c1f046 Junio C Hamano 17 May 2011, 00:01:03 UTC Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix * js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix: sideband_demux(): fix decl-after-stmt 17 May 2011, 00:01:03 UTC
ea1ab4b Junio C Hamano 16 May 2011, 23:44:50 UTC Update draft release notes to 1.7.5.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 May 2011, 23:44:50 UTC
4bbfd8e Junio C Hamano 16 May 2011, 23:39:09 UTC Merge branch 'jn/maint-format-patch-doc' into maint * jn/maint-format-patch-doc: Documentation: describe the format of messages with inline patches 16 May 2011, 23:39:09 UTC
0f51322 Junio C Hamano 16 May 2011, 23:38:56 UTC Merge branch 'ss/cherry-pick-x-doc' into maint * ss/cherry-pick-x-doc: doc: Clarify that "cherry-pick -x" does not use "git notes" 16 May 2011, 23:38:56 UTC
8de4338 Junio C Hamano 16 May 2011, 23:38:46 UTC Merge branch 'vr/merge-base-doc' into maint * vr/merge-base-doc: Restructure documentation for git-merge-base. Documentation: update to git-merge-base --octopus 16 May 2011, 23:38:46 UTC
f704591 Junio C Hamano 16 May 2011, 23:38:16 UTC Merge branch 'sr/maint-fast-import-tighten-option-parsing' into maint * sr/maint-fast-import-tighten-option-parsing: fast-import: fix option parser for no-arg options 16 May 2011, 23:38:16 UTC
a8793d2 Junio C Hamano 16 May 2011, 23:37:54 UTC Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maint * jc/t1506-shell-param-expansion-gotcha: t1507: avoid "${parameter<op>'word'}" inside double-quotes 16 May 2011, 23:37:54 UTC
90e8b9b Junio C Hamano 16 May 2011, 23:37:33 UTC Merge branch 'jc/fix-add-u-unmerged' into maint * jc/fix-add-u-unmerged: Fix "add -u" that sometimes fails to resolve unmerged paths Conflicts: builtin/add.c 16 May 2011, 23:37:33 UTC
81f9068 Junio C Hamano 16 May 2011, 23:37:12 UTC Merge branch 'jn/gitweb-dependency' into maint * jn/gitweb-dependency: Remove gitweb/gitweb.cgi and other legacy targets from main Makefile git-instaweb: Simplify build dependency on gitweb 16 May 2011, 23:37:12 UTC
2f0db1d Junio C Hamano 16 May 2011, 23:37:07 UTC Merge branch 'jc/maint-branch-mergeoptions' into maint * jc/maint-branch-mergeoptions: merge: make branch.<name>.mergeoptions correctly override merge.<option> Conflicts: builtin/merge.c 16 May 2011, 23:37:07 UTC
c69e8b6 Junio C Hamano 16 May 2011, 23:36:46 UTC Merge branch 'jc/maint-add-p-overlapping-hunks' into maint * jc/maint-add-p-overlapping-hunks: t3701: add-p-fix makes the last test to pass "add -p": work-around an old laziness that does not coalesce hunks add--interactive.perl: factor out repeated --recount option t3701: Editing a split hunk in an "add -p" session add -p: 'q' should really quit 16 May 2011, 23:36:46 UTC
43d532e Jim Meyering 16 May 2011, 18:23:35 UTC Documentation/git-fsck.txt: fix typo: unreadable -> unreachable Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 May 2011, 23:35:08 UTC
a1a3fd1 Jeff King 16 May 2011, 06:52:57 UTC send-pack: avoid deadlock on git:// push with failed pack-objects Commit 09c9957c fixes a deadlock in which pack-objects fails, the remote end is still waiting for pack data, and we are still waiting for the remote end to say something (see that commit for a much more in-depth explanation). We solved the problem there by making sure the output pipe is closed on error; thus the remote sees EOF, and proceeds to complain and close its end of the connection. However, in the special case of push over git://, we don't have a pipe, but rather a full-duplex socket, with another dup()-ed descriptor in place of the second half of the pipe. In this case, closing the second descriptor signals nothing to the remote end, and we still deadlock. This patch calls shutdown() explicitly to signal EOF to the other side. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 May 2011, 23:20:01 UTC
7ffe853 Jeff King 16 May 2011, 06:52:11 UTC connect: let callers know if connection is a socket They might care because they want to do a half-duplex close. With pipes, that means simply closing the output descriptor; with a socket, you must actually call shutdown. Instead of exposing the magic no_fork child_process struct, let's encapsulate the test in a function. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 May 2011, 23:20:01 UTC
5cbf824 Jeff King 16 May 2011, 06:46:07 UTC connect: treat generic proxy processes like ssh processes The git_connect function returns two ends of a pipe for talking with a remote, plus a struct child_process representing the other end of the pipe. If we have a direct socket connection, then this points to a special "no_fork" child process. The code path for doing git-over-pipes or git-over-ssh sets up this child process to point to the child git command or the ssh process. When we call finish_connect eventually, we check wait() on the command and report its return value. The code path for git://, on the other hand, always sets it to no_fork. In the case of a direct TCP connection, this makes sense; we have no child process. But in the case of a proxy command (configured by core.gitproxy), we do have a child process, but we throw away its pid, and therefore ignore its return code. Instead, let's keep that information in the proxy case, and respect its return code, which can help catch some errors (though depending on your proxy command, it will be errors reported by the proxy command itself, and not propagated from git commands. Still, it is probably better to propagate such errors than to ignore them). It also means that the child_process field can reliably be used to determine whether the returned descriptors are actually a full-duplex socket, which means we should be using shutdown() instead of a simple close. Signed-off-by: Jeff King <peff@peff.net> Helped-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 May 2011, 23:20:01 UTC
6143214 Junio C Hamano 16 May 2011, 23:19:49 UTC sideband_demux(): fix decl-after-stmt Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 May 2011, 23:19:49 UTC
e9fe74c Jeff King 12 May 2011, 11:10:07 UTC t3503: test cherry picking and reverting root commits We already tested cherry-picking a root commit, but only with the internal merge-recursive strategy. Let's also test the recently-allowed reverting of a root commit, as well as testing with external strategies (which until recently triggered a segfault). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 May 2011, 20:05:03 UTC
fad2652 Jeff King 12 May 2011, 11:09:55 UTC revert: allow reverting a root commit Although it is probably an uncommon operation, there is no reason to disallow it, as it works just fine. It is the reverse of a cherry-pick of a root commit, which is already allowed. We do have to tweak one check on whether we have a merge commit, which assumed we had at least one parent. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 May 2011, 20:01:45 UTC
1618073 Jeff King 12 May 2011, 11:09:46 UTC cherry-pick: handle root commits with external strategies The merge-recursive strategy already handles root commits; it cherry-picks the difference between the empty tree and the root commit's tree. However, for external strategies, we dereference NULL and segfault while building the argument list. Instead, let's handle this by passing the empty tree sha1 to the merge script. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 May 2011, 20:00:30 UTC
96dbe93 Junio C Hamano 15 May 2011, 23:11:55 UTC Update draft release notes to 1.7.5.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 May 2011, 23:11:55 UTC
06c0f42 Junio C Hamano 15 May 2011, 23:10:49 UTC Merge branch 'cn/format-patch-quiet' into maint * cn/format-patch-quiet: format-patch: document --quiet option format-patch: don't pass on the --quiet flag 15 May 2011, 23:10:49 UTC
ab02095 Junio C Hamano 15 May 2011, 22:57:16 UTC Merge branch 'jm/mergetool-submodules' into maint * jm/mergetool-submodules: mergetool: Teach about submodules 15 May 2011, 22:57:16 UTC
92b501f Junio C Hamano 15 May 2011, 22:56:44 UTC Merge branch 'jk/format-patch-quote-special-in-from' into maint * jk/format-patch-quote-special-in-from: pretty: quote rfc822 specials in email addresses 15 May 2011, 22:56:44 UTC
e5c1650 Junio C Hamano 15 May 2011, 22:52:40 UTC Merge branch 'vh/git-svn-doc' into maint * vh/git-svn-doc: git-svn.txt: small typeface improvements git-svn.txt: move option descriptions git-svn.txt: fix usage of --add-author-from 15 May 2011, 22:52:40 UTC
f4e5168 Junio C Hamano 15 May 2011, 19:16:29 UTC git_open_noatime(): drop unused parameter Since commit c793430 (Limit file descriptors used by packs, 2011-02-28), the extra parameter added in f2e872aa (Work around EMFILE when there are too many pack files, 2010-11-01) is not used anymore. Remove it. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> 15 May 2011, 22:24:52 UTC
ccf5ace Junio C Hamano 15 May 2011, 19:16:03 UTC sha1_file: typofix The number zero is spelled "zero", not "zer0". Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 May 2011, 22:24:36 UTC
8c2be75 Jonathan Nieder 14 May 2011, 20:19:21 UTC add, merge, diff: do not use strcasecmp to compare config variable names The config machinery already makes section and variable names lowercase when parsing them, so using strcasecmp for comparison just feels wasteful. No noticeable change intended. Noticed-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 May 2011, 01:53:39 UTC
375f8a0 Junio C Hamano 13 May 2011, 17:57:09 UTC Prepare for 1.7.5.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 May 2011, 17:57:09 UTC
e31b018 Junio C Hamano 13 May 2011, 17:45:21 UTC Merge branch 'aw/maint-rebase-i-p-no-ff' into maint * aw/maint-rebase-i-p-no-ff: git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff 13 May 2011, 17:45:21 UTC
bc67ad8 Junio C Hamano 13 May 2011, 17:45:00 UTC Merge branch 'js/blame-parsename' into maint * js/blame-parsename: t/annotate-tests: Use echo & cat instead of sed blame: tolerate bogus e-mail addresses a bit better 13 May 2011, 17:45:00 UTC
978471d Junio C Hamano 13 May 2011, 17:44:54 UTC Merge branch 'gr/cvsimport-alternative-cvspass-location' into maint * gr/cvsimport-alternative-cvspass-location: Look for password in both CVS and CVSNT password files. 13 May 2011, 17:44:54 UTC
e82c746 Junio C Hamano 13 May 2011, 17:44:46 UTC Merge branch 'cj/p4merge' into maint * cj/p4merge: Pass empty file to p4merge where no base is suitable. 13 May 2011, 17:44:46 UTC
8272bca Junio C Hamano 13 May 2011, 17:44:19 UTC Merge branch 'jk/merge-one-file-working-tree' into maint * jk/merge-one-file-working-tree: merge-one-file: fix broken merges with alternate work trees add tests for merge-index / merge-one-file 13 May 2011, 17:44:19 UTC
a613b53 Junio C Hamano 13 May 2011, 17:41:54 UTC Merge branch 'jc/fix-diff-files-unmerged' into maint * jc/fix-diff-files-unmerged: diff-files: show unmerged entries correctly diff: remove often unused parameters from diff_unmerge() diff.c: return filepair from diff_unmerge() test: use $_z40 from test-lib 13 May 2011, 17:41:54 UTC
4bdbfb1 Junio C Hamano 13 May 2011, 17:41:24 UTC Merge branch 'mz/maint-rename-unmerged' into maint * mz/maint-rename-unmerged: diffcore-rename: don't consider unmerged path as source 13 May 2011, 17:41:24 UTC
ebe8621 Johan Herland 13 May 2011, 16:43:29 UTC t5400: Fix a couple of typos Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 May 2011, 16:57:16 UTC
8f2d4b1 Junio C Hamano 11 May 2011, 22:05:01 UTC Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline' Update the fix for 1.7.5 maintenance track. * jc/maint-1.7.4-pathspec-stdin-and-cmdline: setup_revisions(): take pathspec from command line and --stdin correctly 11 May 2011, 23:09:25 UTC
2d83abd Junio C Hamano 11 May 2011, 21:57:45 UTC Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' Update the fix for 1.7.4 maintenance track. * jc/maint-1.6.6-pathspec-stdin-and-cmdline: setup_revisions(): take pathspec from command line and --stdin correctly 11 May 2011, 21:57:45 UTC
4da5af3 Junio C Hamano 11 May 2011, 21:01:19 UTC setup_revisions(): take pathspec from command line and --stdin correctly When the command line has "--" disambiguator, we take the remainder of argv[] as "prune_data", but when --stdin is given at the same time, we need to append to the existing prune_data and end up attempting to realloc(3) it. That would not work. Fix it by consistently using append_prune_data() throughout the input processing. Also avoid counting the number of existing paths in the function over and over again. Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 May 2011, 21:43:56 UTC
52fd972 Felipe Contreras 10 May 2011, 12:20:39 UTC git-completion: fix regression in zsh support The zsh support of git-completion script in contrib/ is broken for current versions of zsh, and does not notice when there's a subcommand. For example: "git log origi<TAB>" gives no completions because it would try to find a "git origi..." command. This will be fixed by zsh 4.3.12, but for now we can workaround it by backporting the same fix as zsh folks implemented. The problem started after commit v1.7.4-rc0~11^2~2 (bash: get --pretty=m<tab> completion to work with bash v4), which introduced _get_comp_words_by_ref() that comes from bash-completion[1] scripts, and relies on the 'words' variable. However, it turns out 'words' is a special variable used by zsh completion. From zshcompwid(1): [...] the parameters are reset on each function exit (including nested function calls from within the completion widget) to the values they had when the function was entered. As a result, subcommand words are lost. Ouch. This is now fixed in the latest master branch of zsh[2] by simply defining 'words' as hidden (typeset -h), which removes the special meaning inside the emulated bash function. So let's do the same. Jonathan Nieder helped on the commit message. [1] http://bash-completion.alioth.debian.org/ [2] http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=commitdiff;h=e880604f029088f32fb1ecc39213d720ae526aaa Reported-by: Stefan Haller <lists@haller-berlin.de> Comments-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 10 May 2011, 20:08:51 UTC
365c2aa Junio C Hamano 09 May 2011, 04:43:20 UTC t1507: avoid "${parameter<op>'word'}" inside double-quotes Kacper Kornet noticed that a $variable in "word" in the above construct is not substituted by his pdksh. Modern POSIX compliant shells (e.g. dash, ksh, bash) all seem to interpret POSIX "2.6.2 Parameter Expansion" that says "word shall be subjected to tilde expansion, parameter expansion, command substitution, and arithmetic expansion" in ${parameter<op>word}, to mean that the word is expanded as if it appeared in dq pairs, so if the word were "'$variable'" (sans dq) it would expand to a single quote, the value of the $variable and then a single quote. Johannes Sixt reports that the behavior of quoting at the right of :- when the ${...:-...} expansion appears in double-quotes was debated recently at length at the Austin group. We can avoid this issue and future-proof the test by a slight rewrite. Helped-by: Johannes Sixt <j.sixt@viscovery.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 May 2011, 16:19:42 UTC
0bf9fc0 Junio C Hamano 08 May 2011, 20:43:04 UTC t3701: add-p-fix makes the last test to pass Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 May 2011, 20:43:04 UTC
f09f1d3 Jakub Narebski 07 May 2011, 12:45:21 UTC Remove gitweb/gitweb.cgi and other legacy targets from main Makefile Now that there is gitweb/Makefile, let's leave only "gitweb" and "install-gitweb" targets in main Makefile. Those targets just delegate to gitweb's Makefile. Requested-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 May 2011, 18:52:57 UTC
ff2e2cd Jakub Narebski 07 May 2011, 12:45:20 UTC git-instaweb: Simplify build dependency on gitweb Since c0cb4ed (git-instaweb: Configure it to work with new gitweb structure, 2010-05-28) git-instaweb does not re-create gitweb.cgi etc., but makes use of installed gitweb. Therefore simplify git-instaweb dependency on gitweb subsystem in main Makefile from 'gitweb/gitweb.cgi gitweb/static/gitweb.css gitweb/static/gitweb.js' to simply 'gitweb'. This is preparation for splitting gitweb.perl script, and for splitting gitweb.js (to be reassembled / combined on build). This way we don't have to duplicate parts of gitweb/Makefile in main Makefile... it is also more correct description of git-instaweb dependency. Reported-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 May 2011, 18:52:05 UTC
0d8fc3e Junio C Hamano 05 May 2011, 00:42:51 UTC merge: make branch.<name>.mergeoptions correctly override merge.<option> The parsing of the additional command line parameters supplied to the branch.<name>.mergeoptions configuration variable was implemented at the wrong stage. If any merge-related variable came after we read branch.<name>.mergeoptions, the earlier value was overwritten. We should first read all the merge.* configuration, override them by reading from branch.<name>.mergeoptions and then finally read from the command line. This patch should fix it, even though I now strongly suspect that branch.<name>.mergeoptions that gives a single command line that needs to be parsed was likely to be an ill-conceived idea to begin with. Sigh... Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 May 2011, 22:01:56 UTC
4c007ae João Britto 06 May 2011, 04:16:17 UTC Remove duplicated "is a" Signed-off-by: João Britto <jabcalves@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 May 2011, 05:14:15 UTC
4cce4ef Sverre Rabbelier 05 May 2011, 18:56:00 UTC fast-import: fix option parser for no-arg options While refactoring the options parser in bc3c79a (fast-import: add (non-)relative-marks feature, 2009-12-04), it was made too lenient for options that take no argument, fix that. Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 May 2011, 04:21:24 UTC
80b5b69 Junio C Hamano 05 May 2011, 20:46:36 UTC Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix * js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix: send-pack: unbreak push over stateless rpc 05 May 2011, 20:46:36 UTC
e07fd15 Jeff King 05 May 2011, 06:18:45 UTC send-pack: unbreak push over stateless rpc Commit 09c9957 (send-pack: avoid deadlock when pack-object dies early, 2011-04-25) attempted to fix a hang in the stateless rpc case by closing a file descriptor early, but we still need that descriptor. Basically the deadlock can happen when pack-objects fails, and the descriptor to upstream is left open. We never send the pack, so the upstream is left waiting for us to say something, and we are left waiting for upstream to close the connection. In the non-rpc case, our descriptor points straight to the upstream. We hand it off to run-command, which takes ownership and closes the descriptor after pack-objects finishes (whether it succeeds or not). Commit 09c9957 tried to emulate that in the rpc case. That isn't right, though. We actually have a descriptor going back to the remote-helper, and we need to keep using it after pack-objects is finished. Closing it early completely breaks pushing via smart-http. We still need to do something on error to signal the remote-helper that we won't be sending any pack data (otherwise we get the deadlock). In an ideal world, we would send a special packet back that says "Sorry, there was an error". But the remote-helper doesn't understand any such packet, so the best we can do is close the descriptor and let it report that we hung up unexpectedly. Signed-off-by: Jeff King <peff@peff.net> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 May 2011, 20:45:31 UTC
8fe6177 Junio C Hamano 05 May 2011, 18:28:52 UTC t3701: fix here document A broken here-document was not caught because end of file is taken by an implicit end of the here document (POSIX does not seem to say it is an error to lack the delimiter), and everything in the test just turned into a single "cat into a file". Noticed-by: Kacper Kornet <draenog@pld-linux.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 May 2011, 18:28:52 UTC
9fee24c Michael J Gruber 05 May 2011, 09:13:38 UTC git-fast-import.txt: --relative-marks takes no parameter Remove spurious "=" after --relative-marks. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 May 2011, 17:18:18 UTC
2d9932c Dima Sharov 05 May 2011, 06:40:17 UTC shell: add missing initialization of argv0_path According to c6dfb39 (remote-curl: add missing initialization of argv0_path, 2009-10-13), stand-alone programs (non-builtins) must call git_extract_argv0_path(argv[0]) in order to help builds that derive the installation prefix at runtime. Without this call, the program segfaults (or raises an assertion failure). Signed-off-by: Dima Sharov <git.avalakvista@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 May 2011, 16:32:28 UTC
c01bd5a Brian Gernhardt 05 May 2011, 04:43:37 UTC t/annotate-tests: Use echo & cat instead of sed The use of the sed command "1i No robots allowed" caused the version of sed in OS X to die with sed: 1: "1i "No robots allowed"\n": command i expects \ followed by text Since this command was just trying to add a single line to the beginning of the file, do the same with "echo" followed by "cat". Unbreaks t8001 and t8002 on OS X 10.6.7 Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 May 2011, 16:24:21 UTC
2f312e8 Junio C Hamano 04 May 2011, 22:47:40 UTC Git 1.7.5.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 May 2011, 22:47:40 UTC
f5bf1b5 Junio C Hamano 04 May 2011, 21:59:07 UTC Merge branch 'jh/dirstat' into maint * jh/dirstat: --dirstat: In case of renames, use target filename instead of source filename Teach --dirstat not to completely ignore rearranged lines within a file --dirstat-by-file: Make it faster and more correct --dirstat: Describe non-obvious differences relative to --stat or regular diff 04 May 2011, 21:59:07 UTC
419272d Junio C Hamano 04 May 2011, 21:58:56 UTC Merge branch 'sp/maint-clear-postfields' into maint * sp/maint-clear-postfields: http: clear POSTFIELDS when initializing a slot 04 May 2011, 21:58:56 UTC
be44a20 Junio C Hamano 04 May 2011, 21:58:42 UTC Merge branch 'jk/maint-stash-oob' into maint * jk/maint-stash-oob: stash: fix false positive in the invalid ref test. stash: fix accidental apply of non-existent stashes Conflicts: t/t3903-stash.sh 04 May 2011, 21:58:42 UTC
476e424 Junio C Hamano 04 May 2011, 21:58:13 UTC Merge branch 'jk/maint-upload-pack-shallow' into maint * jk/maint-upload-pack-shallow: upload-pack: start pack-objects before async rev-list 04 May 2011, 21:58:13 UTC
e9f1878 Junio C Hamano 04 May 2011, 21:57:49 UTC Merge branch 'dm/stash-k-i-p' into maint * dm/stash-k-i-p: stash: ensure --no-keep-index and --patch can be used in any order stash: add two more tests for --no-keep-index 04 May 2011, 21:57:49 UTC
f28d2e3 Junio C Hamano 04 May 2011, 21:57:38 UTC Merge branch 'jc/pack-objects-bigfile' into maint * jc/pack-objects-bigfile: Teach core.bigfilethreashold to pack-objects 04 May 2011, 21:57:38 UTC
f6bfe76 Junio C Hamano 04 May 2011, 21:57:33 UTC Merge branch 'mg/reflog-with-options' into maint * mg/reflog-with-options: reflog: fix overriding of command line options t/t1411: test reflog with formats builtin/log.c: separate default and setup of cmd_log_init() 04 May 2011, 21:57:33 UTC
0752000 Junio C Hamano 04 May 2011, 21:57:15 UTC Merge branch 'jk/stash-loosen-safety' into maint * jk/stash-loosen-safety: stash: drop dirty worktree check on apply 04 May 2011, 21:57:15 UTC
391b493 Junio C Hamano 04 May 2011, 21:57:06 UTC Merge branch 'ar/clean-rmdir-empty' into maint * ar/clean-rmdir-empty: clean: unreadable directory may still be rmdir-able if it is empty 04 May 2011, 21:57:06 UTC
a3402c1 Junio C Hamano 04 May 2011, 21:56:51 UTC Merge branch 'mg/sha1-path-advise' into maint * mg/sha1-path-advise: sha1_name: Suggest commit:./file for path in subdir t1506: factor out test for "Did you mean..." 04 May 2011, 21:56:51 UTC
d022443 Valentin Haenel 04 May 2011, 19:58:17 UTC git-add.txt: document 'add.ignoreErrors' Signed-off-by: Valentin Haenel <valentin.haenel@gmx.de> Noticed-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 May 2011, 21:52:30 UTC
0a0ec7b Ciaran Jessup 01 May 2011, 22:16:02 UTC Pass empty file to p4merge where no base is suitable. Modify the p4merge client command to pass a reference to an empty file instead of the local file when no base revision available. In the situation where a merge tries to add a file from one branch into a branch that already contains that file (by name), p4merge currently seems to have successfully automatically resolved the 'conflict' when it is opened (correctly if the files differed by just whitespace for example) but leaves the save button disabled. This means the user of the p4merge client cannot commit the resolved changes back to disk and merely exits, leaving the original (merge-conflicted) file intact on the disk. Provide an empty base file to p4merge so that it leaves the save button enabled. This will allow saving of the auto-resolution to disk. Signed-off-by: Ciaran Jessup <ciaranj@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 May 2011, 22:56:05 UTC
58fdef0 Guy Rouillier 01 May 2011, 05:33:52 UTC Look for password in both CVS and CVSNT password files. In conn, if password is not passed on command line, look for a password entry in both the CVS password file and the CVSNT password file. If only one file is found and the requested repository is in that file, or if both files are found but the requested repository is found in only one file, use the password from the single file containing the repository entry. If both files are found and the requested repository is found in both files, then produce an error message. The CVS password file separates tokens with a space character, while the CVSNT password file separates tokens with an equal (=) character. Add a sub find_password_entry that accepts the password file name and a delimiter to eliminate code duplication. Signed-off-by: Guy Rouillier <guyr@burntmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 May 2011, 18:42:59 UTC
6aaeca9 Jeff King 29 April 2011, 22:24:32 UTC merge-one-file: fix broken merges with alternate work trees The merge-one-file tool predates the invention of GIT_WORK_TREE. By the time GIT_WORK_TREE was invented, most people were using the merge-recursive strategy, which handles resolving internally. Therefore these features have had very little testing together. For the most part, merge-one-file just works with GIT_WORK_TREE; most of its heavy lifting is done by plumbing commands which do respect GIT_WORK_TREE properly. The one exception is a shell redirection which touches the worktree directly, writing results to the wrong place in the presence of a GIT_WORK_TREE variable. This means that merges won't even fail; they will silently produce incorrect results, throwing out the entire "theirs" side of files which need content-level merging! This patch makes merge-one-file chdir to the toplevel of the working tree (and exit if we don't have one). This most closely matches the assumption made by the original script (before separate work trees were invented), and matches what happens when the script is called as part of a merge strategy. While we're at it, we'll also error-check the call to cat. Merging a file in a subdirectory could in fact fail, as the redirection relies on the "checkout-index" call just prior to create leading directories. But we never noticed, since we ignored the error return from running cat. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 April 2011, 22:37:43 UTC
cf1af1b Jeff King 29 April 2011, 22:23:54 UTC add tests for merge-index / merge-one-file There were no tests for either, except a brief use in t1200-tutorial. These tools are not used much these days, as most people use the merge-recursive strategy, which handles everything internally. However, they are used by the "octopus" and "resolve" strategies, as well as any custom strategies or merge scripts people have built around them. For example, together with read-tree, they are the simplest way to do a basic content-level merge without checking out the entire repository contents beforehand. This script adds a basic test of the tools to perform one content-level merge. It also shows a failure of the tools to work properly in the face of GIT_WORK_TREE or core.worktree. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 April 2011, 22:37:08 UTC
933e44d Junio C Hamano 06 April 2011, 21:20:57 UTC "add -p": work-around an old laziness that does not coalesce hunks Since 0beee4c (git-add--interactive: remove hunk coalescing, 2008-07-02), "git add--interactive" behaves lazily and passes overlapping hunks to the underlying "git apply" without coalescing. This was partially corrected by 7a26e65 (its partial revert, 2009-05-16), but overlapping hunks are still passed when the patch is edited. Teach "git apply" the --allow-overlap option that disables a safety feature that avoids misapplication of patches by not applying patches to overlapping hunks, and pass this option form "add -p" codepath. Do not even advertise the option, as this is merely a workaround, and the correct fix is to make "add -p" correctly coalesce adjacent patch hunks. Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 April 2011, 22:27:59 UTC
9dce832 Junio C Hamano 06 April 2011, 21:12:34 UTC add--interactive.perl: factor out repeated --recount option Depending on the direction and the target of patch application, we would need to pass --cached and --reverse to underlying "git apply". Also we only pass --check when we are not applying but just checking. But we always pass --recount since 8cbd431 (git-add--interactive: replace hunk recounting with apply --recount, 2008-07-02). Instead of repeating the same --recount over and over again, move it to a single place that actually runs the command, namely, "run_git_apply" subroutine. Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 April 2011, 22:27:59 UTC
f3217e2 Junio C Hamano 29 April 2011, 19:41:16 UTC t3701: Editing a split hunk in an "add -p" session Arnaud Lacombe reported that with the recent change to reject overlapping hunks fed to "git apply", the edit mode of an "add -p" session that lazily feeds overlapping hunks without coalescing adjacent ones claim that the patch does not apply. Expose the problem to be fixed. Cf. http://thread.gmane.org/gmane.comp.version-control.git/170685/focus=171000 Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 April 2011, 22:26:41 UTC
f5ea3f2 Junio C Hamano 29 April 2011, 22:12:32 UTC add -p: 'q' should really quit The "quit" command was added in 9a7a1e0 (git add -p: new "quit" command at the prompt, 2009-04-10) to allow the user to say that hunks other than what have already been chosen are undesirable, and exit the interactive loop immediately. It forgot that there may be an undecided hunk before the current one. In such a case, the interactive loop still goes back to the beginning. Clear all the USE bit for undecided hunks and exit the loop. Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 April 2011, 22:25:03 UTC
65f13f2 Junio C Hamano 29 April 2011, 18:47:10 UTC Start 1.7.5.1 maintenance track Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 April 2011, 18:47:35 UTC
04a67dc Junio C Hamano 29 April 2011, 18:43:18 UTC Merge branch 'mg/x-years-12-months' into maint * mg/x-years-12-months: date: avoid "X years, 12 months" in relative dates 29 April 2011, 18:43:18 UTC
a1dd7e1 Sylvain Rabot 29 April 2011, 18:23:24 UTC git-send-email: fix missing space in error message When the command cannot make a connection to the SMTP server the error message to diagnose the broken configuration is issued. However, when an optional smtp-server-port is given and needs to be reported, the message lacked a space between "hello=<smtp-domain>" and "port=<smtp-server-port>". Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 April 2011, 18:34:32 UTC
9b01f00 Josh Stone 21 April 2011, 22:07:36 UTC blame: tolerate bogus e-mail addresses a bit better The names and e-mails are sanitized by fmt_ident() when creating commits, so that they do not contain "<" nor ">", and the "committer" and "author" lines in the commit object will always be in the form: ("author" | "committer") name SP "<" email ">" SP timestamp SP zone When parsing the email part out, the current code looks for SP starting from the end of the email part, but the author could obfuscate the address as "author at example dot com". We should instead look for SP followed by "<", to match the logic of the side that formats these lines. Signed-off-by: Josh Stone <jistone@redhat.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 April 2011, 18:09:42 UTC
c192f9c Andrew Wong 28 April 2011, 04:35:55 UTC git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff 'git rebase' uses 'git merge' to preserve merges (-p). This preserves the original merge commit correctly, except when the original merge commit was created by 'git merge --no-ff'. In this case, 'git rebase' will fail to preserve the merge, because during 'git rebase', 'git merge' will simply fast-forward and skip the commit. For example: B / \ A---M / ---o---O---P---Q If we try to rebase M onto P, we lose the merge commit and this happens: A---B / ---o---O---P---Q To correct this, we simply do a "no fast-forward" on all merge commits when rebasing. Since by the time we decided to do a 'git merge' inside 'git rebase', it means there was a merge originally, so 'git merge' should always create a merge commit regardless of what the merge branches look like. This way, when rebase M onto P from the above example, we get: B / \ A---M / ---o---O---P---Q Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 April 2011, 16:56:55 UTC
6999c54 Michael J Gruber 27 April 2011, 07:38:27 UTC config.txt,diff-options.txt: porcelain vs. plumbing for color.diff Reading the diff-family and config man pages one may think that the color.diff and color.ui settings apply to all diff commands. Make it clearer that they do not apply to the plumbing variants diff-{files,index,tree}. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 April 2011, 18:25:47 UTC
4d03c18 Jeff King 08 April 2011, 22:40:36 UTC pretty: quote rfc822 specials in email addresses If somebody has a name that includes an rfc822 special, we will output it literally in the "From:" header. This is usually OK, but certain characters (like ".") are supposed to be enclosed in double-quotes in a mail header. In practice, whether this matters may depend on your MUA. Some MUAs will happily take in: From: Foo B. Bar <author@example.com> without quotes, and properly quote the "." when they send the actual mail. Others may not, or may screw up harder things like: From: Foo "The Baz" Bar <author@example.com> For example, mutt will strip the quotes, thinking they are actual syntactic rfc822 quotes. So let's quote properly, and then (if necessary) we still apply rfc2047 encoding on top of that, which should make all MUAs happy. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 April 2011, 22:07:02 UTC
0c8c385 Fraser Tweedale 26 April 2011, 01:32:00 UTC gitweb: supply '-n' to gzip for identical output For projects that do not release official archives, gitweb's snapshot feature would be an excellent alternative, and but without the '-n' ('--no-name') argument, gzip includes a timestamp in output which results in different files. Because some systems hash/checksum downloaded files to ensure integrity of the tarball (e.g FreeBSD), it is desirable to produce tarballs in a reproducible way for that purpose. Whilst '--no-name' is more descriptive, the long version of the flag is not supported on all systems. In particular, OpenBSD does not appear to support it. Supply '-n' to gzip to exclude timestamp from output and produce idential output every time. Signed-off-by: Fraser Tweedale <frase@frase.id.au> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 April 2011, 20:14:02 UTC
7733b27 Valentin Haenel 26 April 2011, 11:34:19 UTC git-svn.txt: small typeface improvements Mark subcommand names as 'subcommand' to make them stand out. Signed-off-by: Valentin Haenel <valentin.haenel@gmx.de> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 April 2011, 18:48:48 UTC
c88d18f Valentin Haenel 26 April 2011, 11:34:18 UTC git-svn.txt: move option descriptions The options '---use-log-author' and '--add-author-from' are applicable to other subcommands except 'fetch' -- therefore move them from the 'fetch' section to the more general 'options' section. Signed-off-by: Valentin Haenel <valentin.haenel@gmx.de> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 April 2011, 18:48:43 UTC
back to top