| 3a46183 | Junio C Hamano | 28 June 2013, 21:56:30 UTC | Git 1.8.3.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 June 2013, 21:56:30 UTC |
| 94b5404 | Stefano Lattarini | 28 June 2013, 17:19:42 UTC | configure: fix option help message for --disable-pthreads The configure option to disable threading is '--disable-pthreads', not '--without-pthreads'. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 June 2013, 17:49:26 UTC |
| 6653aa9 | Junio C Hamano | 28 June 2013, 17:00:00 UTC | Merge branch 'nd/clone-connectivity-shortcut' (early part) into maint Cloning with "git clone --depth N" while fetch.fsckobjects (or transfer.fsckobjects) is set to true did not tell the cut-off points of the shallow history to the process that validates the objects and the history received, causing the validation to fail. * 'nd/clone-connectivity-shortcut' (early part): fetch-pack: prepare updated shallow file before fetching the pack clone: let the user know when check_everything_connected is run | 28 June 2013, 17:00:00 UTC |
| e2652c0 | Junio C Hamano | 27 June 2013, 21:48:14 UTC | Start preparing for 1.8.3.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2013, 21:48:14 UTC |
| 88f90f8 | Junio C Hamano | 27 June 2013, 21:38:22 UTC | Merge branch 'ks/difftool-dir-diff-copy-fix' into maint * ks/difftool-dir-diff-copy-fix: difftool --dir-diff: allow changing any clean working tree file | 27 June 2013, 21:38:23 UTC |
| 6be17ec | Junio C Hamano | 27 June 2013, 21:38:17 UTC | Merge branch 'rr/push-head' into maint * rr/push-head: push: make push.default = current use resolved HEAD push: fail early with detached HEAD and current push: factor out the detached HEAD error message | 27 June 2013, 21:38:17 UTC |
| c9cae1e | Junio C Hamano | 27 June 2013, 21:38:16 UTC | Merge branch 'fc/show-branch-in-rebase-am' into maint * fc/show-branch-in-rebase-am: prompt: fix for simple rebase | 27 June 2013, 21:38:16 UTC |
| f79467e | Junio C Hamano | 27 June 2013, 21:38:14 UTC | Merge branch 'tg/maint-zsh-svn-remote-prompt' into maint * tg/maint-zsh-svn-remote-prompt: prompt: fix show upstream with svn and zsh | 27 June 2013, 21:38:14 UTC |
| fc78791 | Junio C Hamano | 27 June 2013, 21:38:12 UTC | Merge branch 'nd/urls-doc-no-file-hyperlink-fix' into maint * nd/urls-doc-no-file-hyperlink-fix: urls.txt: avoid auto converting to hyperlink | 27 June 2013, 21:38:12 UTC |
| 1ec379f | Junio C Hamano | 27 June 2013, 21:38:09 UTC | Merge branch 'tr/push-no-verify-doc' into maint * tr/push-no-verify-doc: Document push --no-verify | 27 June 2013, 21:38:09 UTC |
| ee1a1dd | Junio C Hamano | 27 June 2013, 21:38:07 UTC | Merge branch 'rs/commit-m-no-edit' into maint * rs/commit-m-no-edit: commit: don't start editor if empty message is given with -m | 27 June 2013, 21:38:07 UTC |
| 872f5bf | Junio C Hamano | 27 June 2013, 21:38:02 UTC | Merge branch 'jc/strbuf-branchname-fix' into maint * jc/strbuf-branchname-fix: strbuf_branchname(): do not double-expand @{-1}~22 | 27 June 2013, 21:38:02 UTC |
| a0bf40d | Junio C Hamano | 27 June 2013, 21:37:55 UTC | Merge branch 'mk/combine-diff-context-horizon-fix' into maint * mk/combine-diff-context-horizon-fix: combine-diff.c: Fix output when changes are exactly 3 lines apart | 27 June 2013, 21:37:56 UTC |
| 81de16a | Junio C Hamano | 27 June 2013, 21:37:52 UTC | Merge branch 'kb/ancestry-path-threedots' into maint * kb/ancestry-path-threedots: revision.c: treat A...B merge bases as if manually specified t6019: demonstrate --ancestry-path A...B breakage | 27 June 2013, 21:37:52 UTC |
| 7f3447c | Junio C Hamano | 27 June 2013, 21:37:44 UTC | Merge branch 'jk/subtree-do-not-push-if-split-fails' into maint * jk/subtree-do-not-push-if-split-fails: contrib/subtree: don't delete remote branches if split fails | 27 June 2013, 21:37:44 UTC |
| 0fb2c97 | Junio C Hamano | 27 June 2013, 21:37:41 UTC | Merge branch 'mh/fetch-into-shallow' into maint * mh/fetch-into-shallow: t5500: add test for fetching with an unknown 'shallow' upload-pack: ignore 'shallow' lines with unknown obj-ids | 27 June 2013, 21:37:41 UTC |
| 11fbc0b | Junio C Hamano | 27 June 2013, 21:37:21 UTC | Merge branch 'jh/checkout-auto-tracking' into maint * jh/checkout-auto-tracking: glossary: Update and rephrase the definition of a remote-tracking branch branch.c: Validate tracking branches with refspecs instead of refs/remotes/* t9114.2: Don't use --track option against "svn-remote"-tracking branches t7201.24: Add refspec to keep --track working t3200.39: tracking setup should fail if there is no matching refspec. checkout: Use remote refspecs when DWIMming tracking branches t2024: Show failure to use refspec when DWIMming remote branch names t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>' | 27 June 2013, 21:37:21 UTC |
| c0add30 | Ramkumar Ramachandra | 18 June 2013, 19:24:05 UTC | completion: complete diff --word-diff Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 June 2013, 15:52:16 UTC |
| f2b4626 | Junio C Hamano | 11 June 2013, 21:24:56 UTC | Merge branch 'maint-1.8.2' into maint * maint-1.8.2: t0070 "mktemp to unwritable directory" needs SANITY pre-push.sample: Make the script executable | 11 June 2013, 21:24:56 UTC |
| b3b8ceb | Torsten Bögershausen | 08 June 2013, 12:17:49 UTC | t0070 "mktemp to unwritable directory" needs SANITY Use the SANITY prerequisite when testing if a temp file can be created in a read only directory. Skip the test under CYGWIN, or skip it under Unix/Linux when it is run as root. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 June 2013, 21:23:31 UTC |
| 3ea5941 | Wieland Hoffmann | 11 June 2013, 12:14:56 UTC | pre-push.sample: Make the script executable githooks(5) says that "[...]the .sample files are executable by default" which was not true. Signed-off-by: Wieland Hoffmann <themineo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 June 2013, 18:22:00 UTC |
| 362de91 | Junio C Hamano | 10 June 2013, 00:16:20 UTC | Git 1.8.3.1 Primarily to push out two regression issues that seem to affect many people, namely, the ".gitignore !directory" bug and "daemon cannot read from $HOME owned by root" bug. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 June 2013, 19:34:42 UTC |
| a454065 | Erik Faye-Lund | 10 June 2013, 05:48:17 UTC | mingw: make mingw_signal return the correct handler Returning the SIGALRM handler for SIGINT is not very useful. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 June 2013, 19:34:03 UTC |
| b1c418e | Junio C Hamano | 10 June 2013, 00:06:55 UTC | Merge branch 'jn/config-ignore-inaccessible' into maint A git daemon that starts as "root" and then drops privilege often leaves $HOME set to that of the root user, which is unreadable by the daemon process, which was diagnosed as a configuration error. Make per-user configuration files that are inaccessible due to EACCES as though these files do not exist to avoid this issue, as the tightening which was originally meant as an additional security has annoyed enough sysadmins. * jn/config-ignore-inaccessible: config: allow inaccessible configuration under $HOME | 10 June 2013, 00:06:56 UTC |
| fd50030 | Junio C Hamano | 10 June 2013, 00:05:15 UTC | Merge branch 'kb/status-ignored-optim-2' into maint Fix recent regression of .gitignore files that list !directory to mark it not-ignored. * kb/status-ignored-optim-2: dir.c: fix ignore processing within not-ignored directories | 10 June 2013, 00:05:15 UTC |
| 467b8fe | René Scharfe | 09 June 2013, 16:33:45 UTC | submodule: remove redundant check for the_index.initialized read_cache already performs the same check and returns immediately if the cache has already been loaded. Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 June 2013, 20:46:45 UTC |
| 26f8f32 | Fredrik Gustafsson | 09 June 2013, 11:11:36 UTC | Document .git/modules A note in the beginning of this document describes the behavior already. This patch just adds where to find the repositories. Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 June 2013, 20:45:32 UTC |
| f445500 | Junio C Hamano | 04 June 2013, 16:50:12 UTC | t/README: test_must_fail is for testing Git When a test wants to make sure there is no <string> in an output file, we should just say "! grep string output". "test_must_fail" is there only to test Git command and catch unusual deaths we know about (e.g. segv) as an error, not as an expected failure. "test_must_fail grep string output" is unnecessary, as we are not making sure the system binaries do not dump core or anything like that. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 June 2013, 20:36:54 UTC |
| 4b8f772 | Felipe Contreras | 30 May 2013, 13:56:21 UTC | sha1_file: trivial style cleanup Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 June 2013, 17:14:48 UTC |
| c3c327d | Karsten Blees | 29 May 2013, 20:32:36 UTC | dir.c: fix ignore processing within not-ignored directories As of 95c6f271 "dir.c: unify is_excluded and is_path_excluded APIs", the is_excluded API no longer recurses into directories that match an ignore pattern, and returns the directory's ignored state for all contained paths. This is OK for normal ignore patterns, i.e. ignoring a directory affects the entire contents recursively. Unfortunately, this also "works" for negated ignore patterns ('!dir'), i.e. the entire contents is "not-ignored" recursively, regardless of ignore patterns that match the contents directly. In prep_exclude, skip recursing into a directory only if it is really ignored (i.e. the ignore pattern is not negated). Signed-off-by: Karsten Blees <blees@dcon.de> Tested-by: Øystein Walle <oystwa@gmail.com> Reviewed-by: Duy Nguyen <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 June 2013, 21:54:38 UTC |
| 0f075b2 | Ramkumar Ramachandra | 29 May 2013, 19:21:51 UTC | push: make push.default = current use resolved HEAD With this change, the output of the push (with push.default set to current) changes subtly from: $ git push ... * [new branch] HEAD -> push-current-head to: $ git push ... * [new branch] push-current-head -> push-current-head This patch was written with a different motivation. There is a problem unique to push.default = current: # on branch push-current-head $ git push # on another terminal $ git checkout master # return to the first terminal # the push tried to push master! This happens because the 'git checkout' on the second terminal races with the 'git push' on the first terminal. Although this patch does not solve the core problem (there is still no guarantee that 'git push' on the first terminal will resolve HEAD before 'git checkout' changes HEAD on the second), it works in practice. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 May 2013, 22:34:07 UTC |
| 7b2ecd8 | Ramkumar Ramachandra | 29 May 2013, 19:21:50 UTC | push: fail early with detached HEAD and current Setting push.default to current adds the refspec "HEAD" for the transport layer to handle. If "HEAD" doesn't resolve to a branch (and since no refspec rhs is specified), the push fails after some time with a cryptic error message: $ git push error: unable to push to unqualified destination: HEAD The destination refspec neither matches an existing ref on the remote nor begins with refs/, and we are unable to guess a prefix based on the source ref. error: failed to push some refs to 'git@github.com:artagnon/git' Fail early with a nicer error message: $ git push fatal: You are not currently on a branch. To push the history leading to the current (detached HEAD) state now, use git push ram HEAD:<name-of-remote-branch> Just like in the upstream and simple cases. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 May 2013, 22:34:04 UTC |
| fada522 | Junio C Hamano | 29 May 2013, 22:21:15 UTC | Start 1.8.3.1 maintenance track Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 May 2013, 22:21:15 UTC |
| a717d9e | Junio C Hamano | 29 May 2013, 22:20:36 UTC | Merge branch 'maint-1.8.2' into maint * maint-1.8.2: trivial: Add missing period in documentation | 29 May 2013, 22:20:36 UTC |
| 32eaf1d | Kenichi Saita | 29 May 2013, 16:01:23 UTC | difftool --dir-diff: allow changing any clean working tree file The temporary directory prepared by "difftool --dir-diff" to show the result of a change can be modified by the user via the tree diff program, and we try hard not to lose changes to them after tree diff program returns to us. However, the set of files to be copied back is computed differently between --symlinks and --no-symlinks modes. The former checks all paths that start out as identical to the working tree file, while the latter checks paths that already had a local modification in the working tree, allowing changes made in the tree diff program to paths that did not have any local change to be lost. Signed-off-by: Kenichi Saita <nitoyon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 May 2013, 19:50:08 UTC |
| 35ee69c | Ramkumar Ramachandra | 29 May 2013, 19:21:49 UTC | push: factor out the detached HEAD error message With push.default set to upstream or simple, and a detached HEAD, git push prints the following error: $ git push fatal: You are not currently on a branch. To push the history leading to the current (detached HEAD) state now, use git push ram HEAD:<name-of-remote-branch> This error is not unique to upstream or simple: current cannot push with a detached HEAD either. So, factor out the error string in preparation for using it in current. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 May 2013, 19:31:10 UTC |
| 1306321 | Felipe Contreras | 29 May 2013, 06:21:28 UTC | prompt: fix for simple rebase When we are rebasing without options ('am' mode), the head rebased lives in '$g/rebase-apply/head-name', so lets use that information so it's reported the same way as if we were doing other rebases (-i or -m). Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 May 2013, 18:27:56 UTC |
| b1d04bf | Phil Hord | 28 May 2013, 19:36:44 UTC | trivial: Add missing period in documentation Signed-off-by: Phil Hord <hordp@cisco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2013, 22:15:29 UTC |
| 2520677 | René Scharfe | 25 May 2013, 21:43:34 UTC | commit: don't start editor if empty message is given with -m If an empty message is specified with the option -m of git commit then the editor is started. That's unexpected and unnecessary. Instead of using the length of the message string for checking if the user specified one, directly remember if the option -m was given. Reported-by: Mislav Marohnić <mislav.marohnic@gmail.com> Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2013, 21:33:01 UTC |
| 6035d6a | Nguyễn Thái Ngọc Duy | 26 May 2013, 01:16:15 UTC | fetch-pack: prepare updated shallow file before fetching the pack index-pack --strict looks up and follows parent commits. If shallow information is not ready by the time index-pack is run, index-pack may be led to non-existent objects. Make fetch-pack save shallow file to disk before invoking index-pack. git learns new global option --shallow-file to pass on the alternate shallow file path. Undocumented (and not even support --shallow-file= syntax) because it's unlikely to be used again elsewhere. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2013, 15:06:08 UTC |
| edca415 | Junio C Hamano | 24 May 2013, 18:34:46 UTC | Git 1.8.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 May 2013, 18:34:46 UTC |
| 4c32e36 | Nguyễn Thái Ngọc Duy | 24 May 2013, 15:44:03 UTC | urls.txt: avoid auto converting to hyperlink file:///path/to/repo.git/ is converted to a hyperlink while others are not. Put a backslash to avoid the conversion. Tested with asciidoc 8.6.5. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 May 2013, 17:55:37 UTC |
| 90d32d1 | Thomas Rast | 23 May 2013, 13:34:11 UTC | Document push --no-verify ec55559 (push: Add support for pre-push hooks, 2013-01-13) forgot to add a note to git-push(1) about the new --no-verify option. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2013, 17:39:12 UTC |
| d0583da | Thomas Gummerer | 22 May 2013, 07:40:39 UTC | prompt: fix show upstream with svn and zsh Currently the __git_ps1 git prompt gives the following error with a repository converted by git-svn, when used with zsh: __git_ps1_show_upstream:19: bad pattern: svn_remote[ __git_ps1_show_upstream:45: bad substitution To reproduce the problem, the __git_ps1_show_upstream function can be executed in a repository converted with git-svn. Both those errors are triggered by spaces after the '['. Zsh also doesn't support initializing an array with `local var=(...)`. This triggers the following error: __git_ps1_show_upstream:41: bad pattern: svn_upstream=(commit Use local -a var=(...) instead to make is compatible. This was introduced by 6d158cba (bash completion: Support "divergence from upstream" messages in __git_ps1), when the script was for bash only. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Acked-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 May 2013, 17:14:01 UTC |
| 5e49f30 | Felipe Contreras | 21 May 2013, 03:47:53 UTC | remote-hg: fix order of configuration comments The other configurations were added in the wrong place. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 May 2013, 16:33:24 UTC |
| 92c4369 | Felipe Contreras | 21 May 2013, 03:47:52 UTC | remote-hg: trivial configuration note cleanup Follow the style of the previous configurations. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 May 2013, 16:33:21 UTC |
| 7370445 | Felipe Contreras | 21 May 2013, 00:33:03 UTC | completion: regression fix for zsh zsh completion wrapper doesn't reimplement __gitcompadd(). Although it should be trivial to do that, let's use __gitcomp_nl() which achieves exactly the same thing, specially since the suffix ($4) has to be empty. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 May 2013, 16:28:45 UTC |
| 9134a46 | Junio C Hamano | 20 May 2013, 23:06:48 UTC | Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: git-svn: introduce --parents parameter for commands branch and tag git-svn: clarify explanation of --destination argument git-svn: multiple fetch/branches/tags keys are supported | 20 May 2013, 23:06:48 UTC |
| f4f4c7f | Tobias Schulte | 15 May 2013, 20:14:43 UTC | git-svn: introduce --parents parameter for commands branch and tag This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts. Signed-off-by: Tobias Schulte <tobias.schulte@gliderpilot.de> Signed-off-by: Eric Wong <normalperson@yhbt.net> | 20 May 2013, 22:05:54 UTC |
| 7d82b4a | Jonathan Nieder | 20 December 2011, 01:24:30 UTC | git-svn: clarify explanation of --destination argument The existing documentation for "-d" does not make it obvious whether its argument is supposed to be a full svn path, a partial svn path, the glob from the config file, or what. Clarify the text and add an example to get the reader started. Reported-by: Nathan Gray <n8gray@n8gray.org> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> | 20 May 2013, 22:05:47 UTC |
| eff714b | Nathan Gray | 20 December 2011, 01:23:50 UTC | git-svn: multiple fetch/branches/tags keys are supported "git svn" can be configured to use multiple fetch, branches, and tags refspecs by passing multiple --branches or --tags options at init time or editing the configuration file later, which can be handy when working with messy Subversion repositories. Add a note to the configuration section documenting how this works. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> | 20 May 2013, 22:05:47 UTC |
| 5dbe064 | Amit Bakshi | 19 May 2013, 11:53:48 UTC | remote-hg: set stdout to binary mode on win32 git clone hangs on windows, and file.write would return errno 22 inside of mercurial's windows.winstdout wrapper class. This patch sets stdout's mode to binary, fixing both issues. [fc: cleaned up] Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 May 2013, 18:18:43 UTC |
| de3a5c6 | Junio C Hamano | 17 May 2013, 19:19:20 UTC | Git 1.8.3-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 May 2013, 19:19:20 UTC |
| 680ed3e | Junio C Hamano | 17 May 2013, 19:16:49 UTC | Merge branch 'fc/doc-style' * fc/doc-style: documentation: trivial style cleanups | 17 May 2013, 19:16:49 UTC |
| 8639f3e | Junio C Hamano | 17 May 2013, 19:16:44 UTC | Merge branch 'dw/asciidoc-sources-are-dot-txt-files' * dw/asciidoc-sources-are-dot-txt-files: CodingGuidelines: Documentation/*.txt are the sources | 17 May 2013, 19:16:44 UTC |
| 0460ed2 | Felipe Contreras | 09 May 2013, 01:16:55 UTC | documentation: trivial style cleanups White-spaces, missing braces, standardize --[no-]foo. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 May 2013, 19:09:21 UTC |
| e86d0a3 | Junio C Hamano | 17 May 2013, 18:55:02 UTC | Merge git://ozlabs.org/~paulus/gitk * git://ozlabs.org/~paulus/gitk: gitk: Update Swedish translation (304t) | 17 May 2013, 18:55:02 UTC |
| 1f197a1 | John Keeping | 17 May 2013, 18:26:08 UTC | difftool: fix dir-diff when file does not exist in working tree Commit 02c5631 (difftool --dir-diff: symlink all files matching the working tree, 2013-03-14) does not handle the case where a file that is being compared does not exist in the working tree. Fix this by checking for existence explicitly before running git-hash-object. Reported-by: Kevin Bracey <kevin@bracey.fi> Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 May 2013, 18:46:53 UTC |
| 31eb360 | Felipe Contreras | 17 May 2013, 17:10:19 UTC | remote-bzr: fixes for older versions of bzr Down to v2.0, by using older but still valid interfaces. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 May 2013, 18:43:36 UTC |
| a70ae58 | Sandor Bodo-Merle | 17 May 2013, 10:32:28 UTC | remote-bzr: fix old organization destroy Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 May 2013, 17:59:08 UTC |
| 9aa66a0 | Peter Krefting | 16 May 2013, 07:14:35 UTC | gitk: Update Swedish translation (304t) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Paul Mackerras <paulus@samba.org> | 16 May 2013, 23:25:25 UTC |
| 629b60a | Felipe Contreras | 16 May 2013, 12:43:15 UTC | Revert "remote-hg: update bookmarks when pulling" This reverts commit 24317ef32ac3111ed00792f9b2921dc19dd28fe2. Different versions of Mercurial have different arguments for bookmarks.updatefromremote(), while it should be possible to call the right function with the right arguments depending on the version, it's safer to restore the old behavior for now. Reported by Rodney Lorrimar. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 May 2013, 22:54:18 UTC |
| 84cf246 | Junio C Hamano | 15 May 2013, 21:32:30 UTC | strbuf_branchname(): do not double-expand @{-1}~22 If you were on 'frotz' branch before you checked out your current branch, "git merge @{-1}~22" means the same as "git merge frotz~22". The strbuf_branchname() function, when interpret_branch_name() gives up resolving "@{-1}~22" fully, returns "frotz" and tells the caller that it only resolved "@{-1}" part of the input, mistakes this as a total failure, and appends the whole thing to the result, yielding "frotz@{-1}~22", which does not make any sense. Inspect the return value from interpret_branch_name() a bit more carefully. When it errored out without consuming anything, we will get -1 and we should return the whole thing. Otherwise, we should append the remainder (i.e. "~22" in the earlier example) to the partially resolved name (i.e. "frotz"). The test suite adds enough number of checkout to make @{-12} in the last test in t0100 that tried to check "we haven't flipped branches that many times" error case succeed; raise the number to a hundred. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 May 2013, 19:53:59 UTC |
| 3244eb9 | Dale R. Worley | 15 May 2013, 22:28:39 UTC | git-submodule.txt: Clarify 'init' and 'add' subcommands. Describe how 'add' sets the submodule's logical name, which is used in the configuration entry names. Clarify that 'init' only sets up the configuration entries for submodules that have already been added elsewhere. Describe that <path> arguments limit the submodules that are configured. Signed-off-by: Dale Worley <worley@ariadne.com> Acked-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 May 2013, 19:01:31 UTC |
| a765499 | Kevin Bracey | 13 May 2013, 15:00:47 UTC | revision.c: treat A...B merge bases as if manually specified The documentation assures users that "A...B" is defined as "A B --not $(git merge-base --all A B)". This wasn't in fact quite true, because the calculated merge bases were not sent to add_rev_cmdline(). The main effect of this was that although git rev-list --ancestry-path A B --not $(git merge-base --all A B) worked, the simpler form git rev-list --ancestry-path A...B failed with a "no bottom commits" error. Other potential users of bottom commits could also be affected by this problem, if they examine revs->cmdline_info; I came across the issue in my proposed history traversal refinements series. So ensure that the calculated merge bases are sent to add_rev_cmdline(), flagged with new 'whence' enum value REV_CMD_MERGE_BASE. Signed-off-by: Kevin Bracey <kevin@bracey.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 May 2013, 18:45:34 UTC |
| 4f4e7e9 | Felipe Contreras | 16 May 2013, 10:04:05 UTC | remote-bzr: fix cloning of non-listable repos Commit 95b0c60 (remote-bzr: add support for bzr repos) introduced a regression by assuming all bzr remote repos are listable, but they are not. If they are not listable they are basically useless, so let's assume there is no bzr repo. Reported-by: Thorsten Kranzkowski <dl8bcu@dl8bcu.de> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 May 2013, 16:29:26 UTC |
| 0c2b1cf | Junio C Hamano | 15 May 2013, 21:58:56 UTC | Merge branch 'fc/remote-hg' (early part) * 'fc/remote-hg' (early part): remote-hg: update bookmarks when pulling remote-hg: don't push fake 'master' bookmark remote-hg: disable forced push by default remote-hg: fix new branch creation remote-hg: add new get_config_bool() helper remote-hg: enable track-branches in hg-git mode remote-hg: get rid of unused exception checks remote-hg: trivial cleanups | 15 May 2013, 21:58:56 UTC |
| 24317ef | Felipe Contreras | 14 May 2013, 04:36:31 UTC | remote-hg: update bookmarks when pulling Otherwise, the user would never ever see new bookmarks, only the ones that (s)he initially cloned. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 May 2013, 19:41:13 UTC |
| 9ed920a | Felipe Contreras | 14 May 2013, 04:36:30 UTC | remote-hg: don't push fake 'master' bookmark We skip it locally, but not for the remote, so let's do so. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 May 2013, 19:40:59 UTC |
| 06f4213 | Felipe Contreras | 14 May 2013, 04:36:29 UTC | remote-hg: disable forced push by default In certain situations we might end up pushing garbage revisions (e.g. in a rebase), and the patches to deal with that haven't been merged yet. So let's disable forced pushes by default. We are essentially reverting back to the old v1.8.2 behavior, to minimize the possibility of regressions, but in a way the user can configure. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 May 2013, 19:40:16 UTC |
| 6373336 | Felipe Contreras | 14 May 2013, 04:36:28 UTC | remote-hg: fix new branch creation When a user creates a new branch with git: % git checkout -b branches/devel and then pushes this branch % git push origin branches/devel which is the way to push new mercurial branches, we do want to create a branch, but the command would fail without newbranch=True. This only matters when force_push=False, but setting newbranch=True unconditionally does not hurt. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 May 2013, 19:35:51 UTC |
| 760ee1c | Felipe Contreras | 14 May 2013, 04:36:27 UTC | remote-hg: add new get_config_bool() helper No functional changes. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 May 2013, 19:33:39 UTC |
| 679e87c | Felipe Contreras | 14 May 2013, 04:36:26 UTC | remote-hg: enable track-branches in hg-git mode The user can turn this off. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 May 2013, 19:33:15 UTC |
| 557399e | Felipe Contreras | 14 May 2013, 04:36:25 UTC | remote-hg: get rid of unused exception checks Remove try/except check because we are no longer calling check_output(), which may throw an exception. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 May 2013, 19:31:54 UTC |
| eb7976e | Felipe Contreras | 14 May 2013, 04:36:24 UTC | remote-hg: trivial cleanups Drop unused "global", and remove redundant comparison of two files. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 May 2013, 19:30:36 UTC |
| aac3857 | Matthijs Kooijman | 15 May 2013, 17:42:14 UTC | combine-diff.c: Fix output when changes are exactly 3 lines apart When a deletion is followed by exactly 3 (or whatever the number of context lines) unchanged lines, followed by another change, the combined diff output would hide the first deletion, resulting in a malformed diff. This happened because the 3 lines before each change are painted interesting, but also marked as no_pre_delete to prevent showing deletes that were previously marked as uninteresting. This behaviour was introduced in c86fbe53 (diff -c/--cc: do not include uninteresting deletion before leading context). However, as a side effect, this could also mark deletes that were already interesting as no_pre_delete. This would happen only if the delete was exactly 3 lines away from the next change, since lines farther away would not be touched by the "paint three lines before the change" code and lines closer would be painted by the "merge two adjacent hunks" code instead, which does not set the no_pre_delete flag. This commit fixes this problem by only setting the no_pre_delete flag for changes that were previously uninteresting. Signed-off-by: Matthijs Kooijman <matthijs@stdin.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 May 2013, 19:02:04 UTC |
| 6a3ac18 | Felipe Contreras | 14 May 2013, 04:20:27 UTC | remote-bzr: update old organization If a clone exists with the old organization (v1.8.2) it will prevent the new shared bzr repository organization from working, so let's remove this repository, which is not used any more. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 May 2013, 22:51:00 UTC |
| ab84621 | Junio C Hamano | 13 May 2013, 18:09:42 UTC | Git 1.8.3-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 May 2013, 18:09:42 UTC |
| f659031 | Kevin Bracey | 13 May 2013, 15:00:46 UTC | t6019: demonstrate --ancestry-path A...B breakage Signed-off-by: Kevin Bracey <kevin@bracey.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 May 2013, 16:00:41 UTC |
| f74455a | Junio C Hamano | 13 May 2013, 14:51:41 UTC | Merge git://ozlabs.org/~paulus/gitk * git://ozlabs.org/~paulus/gitk: gitk: On OSX, bring the gitk window to front gitk: Add support for -G'regex' pickaxe variant gitk: Add menu item for reverting commits gitk: Simplify file filtering gitk: Display the date of a tag in a human-friendly way gitk: Improve behaviour of drop-down lists gitk: Move hard-coded colors to .gitk | 13 May 2013, 14:51:41 UTC |
| 76bf6ff | Tair Sabirgaliev | 24 April 2013, 09:48:27 UTC | gitk: On OSX, bring the gitk window to front On OSX, Tcl/Tk application windows are created behind all the applications down the stack of windows. This is very annoying, because once a gitk window appears, it's the downmost window and switching to it is pain. The patch is: if we are on OSX, use osascript to bring the current Wish process window to front. Signed-off-by: Tair Sabirgaliev <tair.sabirgaliev@gmail.com> Thanks-to: Stefan Haller <lists@haller-berlin.de> Signed-off-by: Paul Mackerras <paulus@samba.org> | 13 May 2013, 11:29:43 UTC |
| c33cb90 | Martin Langhoff | 14 June 2012, 18:34:11 UTC | gitk: Add support for -G'regex' pickaxe variant git log -G'regex' is a very useful alternative to the classic pickaxe. Minimal patch to make it usable from gitk. [zj: reword message] [paulus@samba.org: reword droplist item] Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Paul Mackerras <paulus@samba.org> | 13 May 2013, 11:29:40 UTC |
| 8d97506 | Torsten Bögershausen | 11 May 2013, 13:25:52 UTC | test-bzr: do not use unportable sed '\+' Using sed -e '/[0-9]\+//' to find "one or more digits" is not portable. Use the Basic Regular Expression '/[0-9][0-9]*//' instead. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 May 2013, 19:51:19 UTC |
| 9249175 | Junio C Hamano | 11 May 2013, 18:09:00 UTC | Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: git-svn: added an --include-path flag Git::SVN::*: add missing "NAME" section to perldoc git-svn: avoid self-referencing mergeinfo | 11 May 2013, 18:09:00 UTC |
| 0781aa4 | Nguyễn Thái Ngọc Duy | 03 May 2013, 12:35:11 UTC | clone: let the user know when check_everything_connected is run check_everything_connected could take a long time, especially in the clone case where the whole DAG is traversed. The user deserves to know what's going on. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 May 2013, 17:28:54 UTC |
| 8f3ff93 | Knut Franke | 27 April 2013, 14:36:13 UTC | gitk: Add menu item for reverting commits Sometimes it's helpful (at least psychologically) to have this feature easily accessible. Code borrows heavily from cherrypick. Signed-off-by: Knut Franke <Knut.Franke@gmx.de> Signed-off-by: Paul Mackerras <paulus@samba.org> | 11 May 2013, 08:31:50 UTC |
| 2c8cd90 | Felipe Contreras | 27 April 2013, 22:01:39 UTC | gitk: Simplify file filtering git diff is perfectly able to do this with '-- files', no need for manual filtering. This makes gettreediffs consistent with getblobdiffs. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 11 May 2013, 07:37:08 UTC |
| 685316c | Anand Kumria | 29 April 2013, 05:20:48 UTC | gitk: Display the date of a tag in a human-friendly way By selecting a tag within gitk you can display information about it. This information is output by using the command 'git cat-file tag <tagid>' This outputs the *raw* information from the tag, amongst which is the time - in seconds since the epoch. As useful as that value is, I find it a lot easier to read and process time which it is something like: "Mon Dec 31 14:26:11 2012 -0800" This change will modify the display of tags in gitk like so: @@ -1,7 +1,7 @@ object 5d417842efeafb6e109db7574196901c4e95d273 type commit tag v1.8.1 -tagger Junio C Hamano <gitster@pobox.com> 1356992771 -0800 +tagger Junio C Hamano <gitster@pobox.com> Mon Dec 31 14:26:11 2012 -0800 Git 1.8.1 -----BEGIN PGP SIGNATURE----- Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Paul Mackerras <paulus@samba.org> | 11 May 2013, 07:09:27 UTC |
| 39c1269 | Paul Mackerras | 11 May 2013, 07:08:41 UTC | gitk: Improve behaviour of drop-down lists The drop-down lists used for things like the criteria for finding commits (containing/touching paths/etc.) use a combobox if we are using the ttk widgets. By default the combobox exports its value as the selection when it is changed, which is unnecessary, and sometimes the combobox wouldn't release the selection, which is annoying. To fix this, we make these comboboxes not export their selection, and also clear their selection whenever they are changed. This makes them more like a simple selection of alternatives, improving the look and feel of gitk. Signed-off-by: Paul Mackerras <paulus@samba.org> | 11 May 2013, 07:08:41 UTC |
| 48bc175 | Dale Worley | 07 May 2013, 17:39:46 UTC | CodingGuidelines: Documentation/*.txt are the sources People not familiar with AsciiDoc may not realize they are supposed to update *.txt files and not *.html/*.1 files when preparing patches to the project. Signed-off-by: Dale Worley <worley@ariadne.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 May 2013, 19:13:08 UTC |
| b387c77 | Junio C Hamano | 09 May 2013, 20:32:54 UTC | Sync with v1.8.2.3 * maint: Git 1.8.2.3 t5004: avoid using tar for checking emptiness of archive t5004: ignore pax global header file mergetools/kdiff3: do not use --auto when diffing transport-helper: trivial style cleanup | 09 May 2013, 20:32:54 UTC |
| 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 |
| faf8fde | Junio C Hamano | 09 May 2013, 20:30:19 UTC | Merge branch 'mv/sequencer-pick-error-diag' Fix "git cherry-pick $annotated_tag", which was mistakenly rejected. * mv/sequencer-pick-error-diag: cherry-pick: picking a tag that resolves to a commit is OK | 09 May 2013, 20:30:19 UTC |
| 7c0b0d8 | Junio C Hamano | 09 May 2013, 20:27:49 UTC | cherry-pick: picking a tag that resolves to a commit is OK Earlier, 21246dbb9e0a (cherry-pick: make sure all input objects are commits, 2013-04-11) tried to catch an unlikely "git cherry-pick $blob" as an error, but broke a more important use case to cherry-pick a tag that points at a commit. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 May 2013, 20:29:53 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 |
| a7b1023 | Paul Walmsley | 03 May 2013, 23:10:18 UTC | git-svn: added an --include-path flag The SVN::Fetcher module is now able to filter for inclusion as well as exclusion (as used by --ignore-path). Also added tests, documentation changes and git completion script. If you have an SVN repository with many top level directories and you only want a git-svn clone of some of them then using --ignore-path is difficult as it requires a very long regexp. In this case it's much easier to filter for inclusion. [ew: remove trailing whitespace] Signed-off-by: Paul Walmsley <pjwhams@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> | 09 May 2013, 01:13:36 UTC |
