| 621f1b4 | Junio C Hamano | 07 February 2009, 19:06:34 UTC | GIT 1.6.2-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 February 2009, 19:18:40 UTC |
| c19923a | Junio C Hamano | 07 February 2009, 19:10:16 UTC | Merge branch 'tr/add-p-single' * tr/add-p-single: add -p: import Term::ReadKey with 'require' add -p: print errors in separate color add -p: prompt for single characters | 07 February 2009, 19:10:16 UTC |
| df4364a | Junio C Hamano | 07 February 2009, 19:09:48 UTC | Merge branch 'js/filter-branch-submodule' * js/filter-branch-submodule: filter-branch: do not consider diverging submodules a 'dirty worktree' filter-branch: Fix fatal error on bare repositories | 07 February 2009, 19:09:48 UTC |
| 7de265a | Junio C Hamano | 07 February 2009, 18:44:25 UTC | Merge branch 'maint' * maint: GIT 1.6.1.3 Conflicts: GIT-VERSION-GEN RelNotes | 07 February 2009, 18:44:25 UTC |
| 7851386 | Alexandre Julliard | 07 February 2009, 13:24:54 UTC | emacs: Remove the no longer maintained vc-git package. vc-git is distributed with Emacs since version 22.2, and is maintained in the Emacs CVS tree. This file is obsolete and causes trouble for people who want to add contrib/emacs to their load-path. Signed-off-by: Alexandre Julliard <julliard@winehq.org> | 07 February 2009, 14:14:27 UTC |
| 5a7b3bf | Alexandre Julliard | 07 February 2009, 13:21:58 UTC | git.el: Add some notes about Emacs versions compatibility. Signed-off-by: Alexandre Julliard <julliard@winehq.org> | 07 February 2009, 14:14:22 UTC |
| 6c4f70d | Alexandre Julliard | 07 February 2009, 13:01:26 UTC | git.el: Use integer instead of character constants in case statement. This is for compatibility with XEmacs. Reported by Vassili Karpov. Signed-off-by: Alexandre Julliard <julliard@winehq.org> | 07 February 2009, 13:01:44 UTC |
| efd49f5 | Alexandre Julliard | 27 January 2009, 10:59:54 UTC | git.el: Set a regexp for paragraph-separate in log-edit mode. This allows using fill-paragraph on the log message without interference from the various header fields. Signed-off-by: Alexandre Julliard <julliard@winehq.org> | 07 February 2009, 12:48:54 UTC |
| a7da5c4 | Alexandre Julliard | 23 November 2008, 15:12:45 UTC | git.el: Make git-run-command-region display the error if any. This makes it easier to figure out why a commit has failed. Signed-off-by: Alexandre Julliard <julliard@winehq.org> | 07 February 2009, 12:48:54 UTC |
| ab69e3e | Alexandre Julliard | 23 November 2008, 13:34:48 UTC | git.el: Add commands for cherry-pick and revert. Support for cherry-picking and reverting commits, with automatic formatting of the commit log message. Bound to C-c C-p and C-c C-v respectively. Signed-off-by: Alexandre Julliard <julliard@winehq.org> | 07 February 2009, 12:48:54 UTC |
| 811b10c | Alexandre Julliard | 23 November 2008, 13:25:50 UTC | git.el: Add a command to create a new branch. Prompts for a branch name, create a new branch at HEAD and switch to it. Bound to C-c C-b by default. Based on a patch by Rémi Vanicat <vanicat@debian.org>. Signed-off-by: Alexandre Julliard <julliard@winehq.org> | 07 February 2009, 12:48:54 UTC |
| c375e9d | Alexandre Julliard | 23 November 2008, 13:16:22 UTC | git.el: Add a checkout command. Prompts for a branch name and checks it out. Bound to C-c C-o by default. Based on a patch by Rémi Vanicat <vanicat@debian.org>. Signed-off-by: Alexandre Julliard <julliard@winehq.org> | 07 February 2009, 12:48:48 UTC |
| b59122f | Junio C Hamano | 07 February 2009, 08:51:47 UTC | GIT 1.6.1.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 February 2009, 08:51:47 UTC |
| 748aa68 | Thomas Rast | 06 February 2009, 19:30:01 UTC | add -p: import Term::ReadKey with 'require' eval{use...} is no good because the 'use' is evaluated at compile time, so manually 'require' it. We need to forward declare the functions we use, otherwise Perl raises a compilation error. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 February 2009, 08:37:36 UTC |
| ba743d1 | Junio C Hamano | 06 February 2009, 03:40:41 UTC | Merge branch 'js/maint-remote-remove-mirror' * js/maint-remote-remove-mirror: builtin-remote: make rm operation safer in mirrored repository builtin-remote: make rm() use properly named variable to hold return value | 06 February 2009, 03:40:41 UTC |
| 7b75b33 | Junio C Hamano | 06 February 2009, 03:40:39 UTC | Merge branch 'js/notes' * js/notes: git-notes: fix printing of multi-line notes notes: fix core.notesRef documentation Add an expensive test for git-notes Speed up git notes lookup Add a script to edit/inspect notes Introduce commit notes Conflicts: pretty.c | 06 February 2009, 03:40:39 UTC |
| 5d680a6 | Junio C Hamano | 06 February 2009, 03:40:36 UTC | Merge branch 'jc/refuse-push-to-current' * jc/refuse-push-to-current: receive-pack: explain what to do when push updates the current branch | 06 February 2009, 03:40:36 UTC |
| 7aa4e73 | Junio C Hamano | 06 February 2009, 03:40:36 UTC | Merge branch 'rc/http-push' * rc/http-push: http-push: wrap signature of get_remote_object_url http-push: add back underscore separator before lock token http-push.c: get_remote_object_url() is only used under USE_CURL_MULTI http-push: refactor request url creation | 06 February 2009, 03:40:36 UTC |
| 9242431 | Junio C Hamano | 06 February 2009, 03:40:35 UTC | Merge branch 'gt/utf8-width' * gt/utf8-width: builtin-blame.c: Use utf8_strwidth for author's names utf8: add utf8_strwidth() | 06 February 2009, 03:40:35 UTC |
| 74b11bc | Junio C Hamano | 06 February 2009, 03:40:35 UTC | Merge branch 'jk/head-symref' * jk/head-symref: symbolic ref: refuse non-ref targets in HEAD validate_headref: tighten ref-matching to just branches | 06 February 2009, 03:40:35 UTC |
| b371922 | Junio C Hamano | 06 February 2009, 03:40:35 UTC | Merge branch 'cb/mergetool' * cb/mergetool: mergetool: fix running mergetool in sub-directories mergetool: Add a test for running mergetool in a sub-directory mergetool: respect autocrlf by using checkout-index | 06 February 2009, 03:40:35 UTC |
| 84b9627 | Junio C Hamano | 06 February 2009, 03:40:25 UTC | Merge branch 'maint' * maint: Fixed broken git help -w when installing from RPM | 06 February 2009, 03:40:25 UTC |
| 919ab64 | Junio C Hamano | 06 February 2009, 03:38:58 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: Fixed broken git help -w when installing from RPM | 06 February 2009, 03:38:58 UTC |
| c789350 | Junio C Hamano | 06 February 2009, 02:06:11 UTC | Merge branch 'jc/maint-apply-fix' into maint * jc/maint-apply-fix: builtin-apply.c: do not set bogus mode in check_preimage() for deleted path | 06 February 2009, 02:06:11 UTC |
| 7b26171 | Junio C Hamano | 06 February 2009, 02:06:03 UTC | Merge branch 'am/maint-push-doc' into maint * am/maint-push-doc: Documentation: rework src/dst description in git push Documentation: more git push examples Documentation: simplify refspec format description | 06 February 2009, 02:06:03 UTC |
| f20408d | Junio C Hamano | 06 February 2009, 02:05:43 UTC | Merge branch 'sg/maint-gitdir-in-subdir' into maint * sg/maint-gitdir-in-subdir: Fix gitdir detection when in subdir of gitdir | 06 February 2009, 02:05:43 UTC |
| 141b6b8 | Junio C Hamano | 06 February 2009, 02:01:00 UTC | Merge branch 'lt/maint-wrap-zlib' into maint * lt/maint-wrap-zlib: Wrap inflate and other zlib routines for better error reporting Conflicts: http-push.c http-walker.c sha1_file.c | 06 February 2009, 02:01:00 UTC |
| cc91e1b | Junio C Hamano | 06 February 2009, 01:54:17 UTC | Merge branch 'jc/maint-split-diff-metainfo' into maint * jc/maint-split-diff-metainfo: diff.c: output correct index lines for a split diff | 06 February 2009, 01:54:17 UTC |
| 8abc618 | Junio C Hamano | 06 February 2009, 01:54:12 UTC | Merge branch 'js/maint-all-implies-HEAD' into maint * js/maint-all-implies-HEAD: bundle: allow the same ref to be given more than once revision walker: include a detached HEAD in --all | 06 February 2009, 01:54:12 UTC |
| 8c4c286 | Junio C Hamano | 06 February 2009, 01:52:22 UTC | Merge branch 'kc/maint-diff-bwi-fix' into maint * kc/maint-diff-bwi-fix: Fix combined use of whitespace ignore options to diff test more combinations of ignore-whitespace options to diff | 06 February 2009, 01:52:22 UTC |
| 26be15f | Johannes Schindelin | 05 February 2009, 18:19:33 UTC | filter-branch: do not consider diverging submodules a 'dirty worktree' At the end of filter-branch in a non-bare repository, the work tree is updated with "read-tree -m -u HEAD", to carry the change forward in case the current branch was rewritten. In order to avoid losing any local change during this step, filter-branch refuses to work when there are local changes in the work tree. This "read-tree -m -u HEAD" operation does not affect what commit is checked out in a submodule (iow, it does not touch .git/HEAD in a submodule checkout), and checking if there is any local change to the submodule is not useful. Staged submodules _are_ considered to be 'dirty', however, as the "read-tree -m -u HEAD" could result in loss of staged information otherwise. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2009, 01:48:04 UTC |
| a301973 | Thomas Rast | 05 February 2009, 08:28:27 UTC | add -p: print errors in separate color Print interaction error messages in color.interactive.error, which defaults to the value of color.interactive.help. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2009, 01:44:39 UTC |
| ca6ac7f | Thomas Rast | 05 February 2009, 08:28:26 UTC | add -p: prompt for single characters Use Term::ReadKey, if available and enabled with interactive.singlekey, to let the user answer add -p's prompts by pressing a single key. We're not doing the same in the main 'add -i' interface because file selection etc. may expect several characters. Two commands take an argument: 'g' can easily cope since it'll just offer a choice of chunks. '/' now (unconditionally, even without readkey) offers a chance to enter a regex if none was given. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2009, 01:44:10 UTC |
| 7233d22 | Jay Soffian | 05 February 2009, 06:09:08 UTC | Makefile: minor improvements for Mac OS X (Darwin) 1) Instead of requesting OLD_ICONV on all Mac OS X versions except for 10.5 (which will break when 10.6 is released), exlicitly request it for versions older than 10.5. 2) NO_STRLCPY is not needed since Mac OS X 10.2. Noticed by Benjamin Kramer. Note that uname -r returns the underlying Darwin version, which can be mapped to Mac OS X version at http://www.opensource.apple.com/darwinsource/ Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2009, 08:33:40 UTC |
| 98bb1ff | Pascal Obry | 05 February 2009, 07:37:24 UTC | config.mak.in: define paths without trailing slash The main Makefile defines gitexecdir and template_dir without trailing slash. config.mak.in should do the same to be consistent. Signed-off-by: Pascal Obry <pascal@obry.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2009, 08:29:23 UTC |
| 0c0ead7 | Junio C Hamano | 05 February 2009, 08:04:17 UTC | Makefile: fix misdetection of relative pathnames The installation rules wanted to differentiate between a template_dir that is given as an absolute path (e.g. /usr/share/git-core/templates) and a relative one (e.g. share/git-core/templates) but it was done by checking if $(abspath $(template_dir)) and $(template_dir) yield the same string. This was wrong in at least two ways. * The user can give template_dir with a trailing slash from the command line to invoke make or from the included config.mak. A directory path ought to mean the same thing with or without such a trailing slash but use of $(abspath) means an absolute path with a trailing slash fails the test. * Versions of GNU make older than 3.81 do not have $(abspath) to begin with. This changes the detection logic to see if the given path begins with a slash. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2009, 08:28:43 UTC |
| ab2fdb3 | David J. Mellor | 05 February 2009, 04:14:29 UTC | Fixed broken git help -w when installing from RPM After the git-core package was renamed to git, git help -w was still looking for files in /usr/share/doc/git-core-$VERSION instead of /usr/share/doc/git-$VERSION. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2009, 06:00:49 UTC |
| 88ccb9f | Junio C Hamano | 05 February 2009, 00:40:15 UTC | Merge branch 'jc/fsck' (early part) * 'jc/fsck' (early part): fsck: check loose objects from alternate object stores by default fsck: HEAD is part of refs | 05 February 2009, 00:40:15 UTC |
| ffaf9cc | Geoffrey Thomas | 30 January 2009, 09:41:29 UTC | builtin-blame.c: Use utf8_strwidth for author's names git blame misaligns output if a author's name has a differing display width and strlen; for instance, an accented Latin letter that takes two bytes to encode will cause the rest of the line to be shifted to the left by one. To fix this, use utf8_strwidth instead of strlen (and compute the padding ourselves, since printf doesn't know about UTF-8). Signed-off-by: Geoffrey Thomas <geofft@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2009, 00:30:45 UTC |
| 8a9391e | Geoffrey Thomas | 30 January 2009, 09:41:28 UTC | utf8: add utf8_strwidth() I'm about to use this pattern more than once, so make it a common function. Signed-off-by: Geoffrey Thomas <geofft@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2009, 00:30:43 UTC |
| 8aa7eeb | Nanako Shiraishi | 04 February 2009, 09:15:29 UTC | git-bundle doc: update examples This rewrites the example part of the bundle doucmentation to follow the suggestion made by Junio during a recent discussion (gmane 108030). Instead of just showing different ways to create and use bundles in a disconnected fashion, the rewritten example first shows the simplest "full cycle" of sneakernet workflow, and then introduces various variations. The words are mostly taken from Junio's outline. I only reformatted them and proofread to make sure the end result flows naturally. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 23:16:35 UTC |
| 34263de | Alexander Potashev | 04 January 2009, 18:39:27 UTC | Replace deprecated dashed git commands in usage Signed-off-by: Alexander Potashev <aspotashev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 23:08:49 UTC |
| 5c7eee0 | jidanni@jidanni.org | 06 January 2009, 03:14:02 UTC | git-show-branch doc: show -g as synonym to --reflog in the list Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 23:08:08 UTC |
| e1ff064 | Thomas Rast | 04 February 2009, 10:04:18 UTC | contrib git-resurrect: find traces of a branch name and resurrect it Add a tool 'git-resurrect.sh <branch>' that tries to find traces of the <branch> in the HEAD reflog and, optionally, all merge commits in the repository. It can then resurrect the branch, pointing it at the most recent of all candidate commits found. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 23:07:49 UTC |
| de81390 | Junio C Hamano | 04 February 2009, 21:07:09 UTC | Merge branch 'maint' * maint: urls.txt: document optional port specification in git URLS builtin-mv.c: check for unversionned files before looking at the destination. Add a testcase for "git mv -f" on untracked files. Missing && in t/t7001.sh. | 04 February 2009, 21:07:09 UTC |
| d3f552b | Junio C Hamano | 04 February 2009, 21:07:06 UTC | Merge branch 'wp/add-patch-find' * wp/add-patch-find: add -p: trap Ctrl-D in 'goto' mode add -p: change prompt separator for 'g' In add --patch, Handle K,k,J,j slightly more gracefully. Add / command in add --patch git-add -i/-p: Change prompt separater from slash to comma | 04 February 2009, 21:07:06 UTC |
| a4f004b | Junio C Hamano | 04 February 2009, 21:07:02 UTC | Merge branch 'ns/am-slacker' * ns/am-slacker: git-am: Add --ignore-date option am: Add --committer-date-is-author-date option Conflicts: git-am.sh | 04 February 2009, 21:07:02 UTC |
| f26b5dc | Stefan Naewe | 04 February 2009, 20:49:35 UTC | urls.txt: document optional port specification in git URLS Signed-off-by: Stefan Naewe <stefan.naewe+git@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 21:06:06 UTC |
| 745bc77 | Junio C Hamano | 04 February 2009, 19:49:07 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: builtin-mv.c: check for unversionned files before looking at the destination. Add a testcase for "git mv -f" on untracked files. Missing && in t/t7001.sh. | 04 February 2009, 19:49:07 UTC |
| 5aed3c6 | Matthieu Moy | 04 February 2009, 09:32:08 UTC | builtin-mv.c: check for unversionned files before looking at the destination. The previous code was failing in the case where one moves an unversionned file to an existing destination, with mv -f: the "existing destination" was checked first, and the error was cancelled by the force flag. We now check the unrecoverable error first, which fixes the bug. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 19:07:42 UTC |
| c8ba6b1 | Matthieu Moy | 04 February 2009, 09:32:07 UTC | Add a testcase for "git mv -f" on untracked files. This currently fails with: git: builtin-mv.c:217: cmd_mv: Assertion `pos >= 0' failed. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 19:04:56 UTC |
| 720ec6b | Matthieu Moy | 04 February 2009, 09:32:06 UTC | Missing && in t/t7001.sh. Without this, the exit status is only the one of the last line. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 19:04:44 UTC |
| 441adf0 | Jay Soffian | 04 February 2009, 16:06:07 UTC | builtin-remote: make rm operation safer in mirrored repository "git remote rm <repo>" happily removes non-remote refs and their reflogs. This may be okay if the repository truely is a mirror, but if the user had done "git remote add --mirror <repo>" by accident and was just undoing their mistake, then they are left in a situation that is difficult to recover from. After this commit, "git remote rm" skips over non-remote refs. The user is advised on how remove branches using "git branch -d", which itself has nice safety checks wrt to branch removal lacking from "git remote rm". Non-remote non-branch refs are skipped silently. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 16:47:57 UTC |
| 68c02d7 | Thomas Rast | 02 February 2009, 21:46:29 UTC | add -p: trap Ctrl-D in 'goto' mode If the user hit Ctrl-D (EOF) while the script was in 'go to hunk?' mode, it threw an undefined variable error. Explicitly test for EOF and have it re-enter the goto prompt loop. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 08:52:52 UTC |
| 4404b2e | Thomas Rast | 02 February 2009, 21:46:28 UTC | add -p: change prompt separator for 'g' 57886bc (git-add -i/-p: Change prompt separater from slash to comma, 2008-11-27) changed the prompt separator to ',', but forgot to adapt the 'g' (goto) command. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 08:52:27 UTC |
| b63bc0b | Junio C Hamano | 04 February 2009, 08:12:19 UTC | Merge branch 'maint' * maint: User-manual: "git stash <comment>" form is long gone add test-dump-cache-tree in Makefile fix typo in Documentation apply: fix access to an uninitialized mode variable, found by valgrind Conflicts: Makefile | 04 February 2009, 08:12:19 UTC |
| f081731 | Junio C Hamano | 04 February 2009, 07:50:09 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: User-manual: "git stash <comment>" form is long gone add test-dump-cache-tree in Makefile fix typo in Documentation apply: fix access to an uninitialized mode variable, found by valgrind | 04 February 2009, 07:50:09 UTC |
| 2d20b7e | Tay Ray Chuan | 03 February 2009, 12:39:00 UTC | http-push: wrap signature of get_remote_object_url The signature of get_remote_object_url stands at 96 characters (as pointed out by Dscho); this patch wraps it so that it conforms to the 80 characters guideline. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 06:51:48 UTC |
| 223bd93 | Tay Ray Chuan | 03 February 2009, 13:07:26 UTC | http-push: add back underscore separator before lock token 817d14a (http-push: refactor request url creation, 2009-01-31) removed the underscore separator between the object path and the appended lock token. This patch adds it back. This would be keeping in line with the aforementioned patch's objective of refactoring, without changing the behaviour and effect, of the code. This would also be useful for testing if the lock token has been indeed appended to the object url. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 06:16:24 UTC |
| 7a85f6a | William Pursell | 03 February 2009, 22:41:14 UTC | User-manual: "git stash <comment>" form is long gone These days you must explicitly say "git stash save <comment>". Signed-off-by: William Pursell <bill.pursell@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 06:13:47 UTC |
| 37fc57a | Guanqun Lu | 04 February 2009, 21:00:41 UTC | add test-dump-cache-tree in Makefile 5c5ba73 (Makefile: Use generic rule to build test programs, 2007-05-31) tried to use generic rule to build test programs, but it misses the file 'dump-cache-tree.c', since its name is not prefixed by 'test-'. This commit solves this little problem by renaming this file instead of carrying out an explicit rule in Makefile. Signed-off-by: Guanqun Lu <guanqun.lu@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 06:11:44 UTC |
| c9a8abc | Guanqun Lu | 04 February 2009, 21:00:40 UTC | fix typo in Documentation Signed-off-by: Guanqun Lu <guanqun.lu@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 06:09:03 UTC |
| 738a94a | Thomas Rast | 03 February 2009, 09:20:54 UTC | bash: offer to show (un)staged changes Add a bit of code to __git_ps1 that lets it append '*' to the branch name if there are any unstaged changes, and '+' if there are any staged changes. Since this is a rather expensive operation and will force a lot of data into the cache whenever you first enter a repository, you have to enable it manually by setting GIT_PS1_SHOWDIRTYSTATE to a nonempty value. The configuration variable bash.showDirtyState can then be used to disable it again for some repositories. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 06:07:51 UTC |
| e1e4389 | Johannes Schindelin | 04 February 2009, 01:50:15 UTC | apply: fix access to an uninitialized mode variable, found by valgrind When 'tpatch' was initialized successfully, st_mode was already taken from the previous diff. We should not try to override it with data from an lstat() that was never called. This is a companion patch to 7a07841(git-apply: handle a patch that touches the same path more than once better). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 06:04:31 UTC |
| 9273b56 | Eric Kidd | 03 February 2009, 18:27:03 UTC | filter-branch: Fix fatal error on bare repositories When git filter-branch is run on a bare repository, it prints out a fatal error message: $ git filter-branch branch Rewrite 476c4839280c219c2317376b661d9d95c1727fc3 (9/9) WARNING: Ref 'refs/heads/branch' is unchanged fatal: This operation must be run in a work tree Note that this fatal error message doesn't prevent git filter-branch from exiting successfully. (Why doesn't git filter-branch actually exit with an error when a shell command fails? I'm not sure why it was designed this way.) This error message is caused by the following section of code at the end of git-filter-branch.sh: if [ "$(is_bare_repository)" = false ]; then unset GIT_DIR GIT_WORK_TREE GIT_INDEX_FILE test -z "$ORIG_GIT_DIR" || { GIT_DIR="$ORIG_GIT_DIR" && export GIT_DIR } ... elided ... git read-tree -u -m HEAD fi The problem is the call to $(is_bare_repository), which is made before GIT_DIR and GIT_WORK_TREE are restored. This call always returns "false", even when we're running in a bare repository. But this means that we will attempt to call 'git read-tree' even in a bare repository, which will fail and print an error. This patch modifies git-filter-branch.sh to restore the original environment variables before trying to call is_bare_repository. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 05:54:02 UTC |
| e656fc9 | Junio C Hamano | 04 February 2009, 05:46:33 UTC | tests: fix test_commit() for case insensitive filesystems Brian Gernhardt noticed that t3411 was broken recently on case insensitive filesystems. 0088496 (test-lib.sh: introduce test_commit() and test_merge() helpers, 2009-01-27) used a tag and a file with the same name, only different in case, and converted many existing tests that needed only a file (or a tag). Some tests may want to refer to a rev or a file, but on a filesystem that loses cases, referring to either without disambiguation mark ("--") on the command line now triggers an error (t3411 was the only one such test). Fix it by using a filename that is different from the tagname each step creates. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 05:50:47 UTC |
| e02f176 | Jay Soffian | 03 February 2009, 17:51:12 UTC | builtin-remote: make rm() use properly named variable to hold return value "i" is a loop counter and should not be used to hold a return value; use "result" instead which is consistent with the rest of builtin-remote.c. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 05:12:23 UTC |
| 61d8660 | Junio C Hamano | 04 February 2009, 05:07:07 UTC | t3412: further simplify setting of GIT_EDITOR 2182896 (t3412: clean up GIT_EDITOR usage, 2009-01-30) tried to clean up the script's use of GIT_EDITOR, but it can further be simplified, because that is how test-lib.sh sets things up already. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 05:07:11 UTC |
| 3d95d92 | Junio C Hamano | 01 February 2009, 01:34:05 UTC | receive-pack: explain what to do when push updates the current branch This makes "git push" issue a more detailed instruction when a user pushes into the current branch of a non-bare repository without having an explicit configuration set to receive.denycurrentbranch. In such a case, it will also tell the user that the default will change to refusal in a future version of git. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 February 2009, 08:39:18 UTC |
| bd9efbf | Junio C Hamano | 03 February 2009, 08:32:34 UTC | Merge branch 'maint' * maint: grep: pass -I (ignore binary) down to external grep | 03 February 2009, 08:32:34 UTC |
| 2819075 | Junio C Hamano | 03 February 2009, 08:32:29 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: grep: pass -I (ignore binary) down to external grep | 03 February 2009, 08:32:29 UTC |
| f39e4cf | Junio C Hamano | 03 February 2009, 08:26:17 UTC | Merge branch 'jc/maint-add-u-remove-conflicted' * jc/maint-add-u-remove-conflicted: add -u: do not fail to resolve a path as deleted | 03 February 2009, 08:26:17 UTC |
| 1487eb6 | Junio C Hamano | 03 February 2009, 08:26:12 UTC | Merge branch 'jk/maint-cleanup-after-exec-failure' * jk/maint-cleanup-after-exec-failure: git: use run_command() to execute dashed externals run_command(): help callers distinguish errors run_command(): handle missing command errors more gracefully git: s/run_command/run_builtin/ | 03 February 2009, 08:26:12 UTC |
| dcdb333 | Junio C Hamano | 03 February 2009, 06:24:40 UTC | http-push.c: get_remote_object_url() is only used under USE_CURL_MULTI Otherwise -Wunused-function (which is implied by -Wall) triggers. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 February 2009, 06:44:41 UTC |
| bc39564 | Junio C Hamano | 02 February 2009, 18:58:20 UTC | grep: pass -I (ignore binary) down to external grep We forgot to pass this option to the external grep process. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 February 2009, 18:58:20 UTC |
| ace30ba | William Pursell | 27 November 2008, 04:08:03 UTC | In add --patch, Handle K,k,J,j slightly more gracefully. Instead of printing the help menu, this will print "No next hunk" and then process the given hunk again. Signed-off-by: William Pursell <bill.pursell@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 February 2009, 03:43:38 UTC |
| dd971cc | William Pursell | 27 November 2008, 04:07:57 UTC | Add / command in add --patch This command allows the user to skip hunks that don't match the specified regex. Signed-off-by: William Pursell <bill.pursell@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 February 2009, 03:43:38 UTC |
| 57886bc | William Pursell | 27 November 2008, 04:07:52 UTC | git-add -i/-p: Change prompt separater from slash to comma Otherwise the find command '/' soon to be introduced will be hard to see. Signed-off-by: William Pursell <bill.pursell@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 February 2009, 03:43:37 UTC |
| 2ea3c17 | Thomas Rast | 30 January 2009, 22:47:01 UTC | t3412: use log|name-rev instead of log --graph Replace all 'git log --graph' calls for history verification with the combination of 'git log ...| git name-rev' first introduced by a6c7a27 (rebase -i: correctly remember --root flag across --continue, 2009-01-26). This should be less susceptible to format changes than the --graph code. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 February 2009, 02:54:04 UTC |
| e80f97e | Jakub Narebski | 01 February 2009, 21:37:45 UTC | gitweb: Update README that gitweb works better with PATH_INFO One had to configure gitweb for it to find static files (stylesheets, images) when using path_info URLs. Now that it is not necessary thanks to adding BASE element to HTML head if needed, update README to reflect this fact. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 February 2009, 02:33:51 UTC |
| 08e6710 | Kirill Smelkov | 01 February 2009, 17:45:05 UTC | mailinfo: cleanup extra spaces for complex 'From:' currently for cases like From: A U Thor <a.u.thor@example.com> (Comment) mailinfo extracts the following 'Author:' field: Author: A U Thor (Comment) ^^ which has two extra spaces left in there after removed email part. I think this is wrong so here is a fix. Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 February 2009, 20:11:15 UTC |
| c0f6f67 | Junio C Hamano | 01 February 2009, 02:09:17 UTC | Merge branch 'ks/maint-mailinfo-folded' * ks/maint-mailinfo-folded: mailinfo: tests for RFC2047 examples mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)' mailinfo: 'From:' header should be unfold as well mailinfo: correctly handle multiline 'Subject:' header | 01 February 2009, 02:09:17 UTC |
| 15b8e94 | Junio C Hamano | 01 February 2009, 02:08:58 UTC | Merge branch 'jc/maint-apply-fix' * jc/maint-apply-fix: builtin-apply.c: do not set bogus mode in check_preimage() for deleted path | 01 February 2009, 02:08:58 UTC |
| 32f2f11 | Junio C Hamano | 01 February 2009, 02:08:31 UTC | Merge branch 'am/maint-push-doc' * am/maint-push-doc: Documentation: rework src/dst description in git push Documentation: more git push examples Documentation: simplify refspec format description | 01 February 2009, 02:08:31 UTC |
| 2d40cad | Junio C Hamano | 01 February 2009, 02:08:22 UTC | Merge branch 'jc/maint-allow-uninteresting-missing' * jc/maint-allow-uninteresting-missing: revision traversal: allow UNINTERESTING objects to be missing | 01 February 2009, 02:08:22 UTC |
| b37f26d | Junio C Hamano | 01 February 2009, 02:07:59 UTC | Merge branch 'jg/tag-contains' * jg/tag-contains: git-tag: Add --contains option Make has_commit() non-static Make opt_parse_with_commit() non-static | 01 February 2009, 02:07:59 UTC |
| 2925414 | Junio C Hamano | 01 February 2009, 02:07:55 UTC | Merge branch 'js/maint-rebase-i-submodule' * js/maint-rebase-i-submodule: Fix submodule squashing into unrelated commit rebase -i squashes submodule changes into unrelated commit | 01 February 2009, 02:07:55 UTC |
| bdf6442 | Junio C Hamano | 01 February 2009, 02:07:42 UTC | Merge branch 'jc/maint-split-diff-metainfo' * jc/maint-split-diff-metainfo: diff.c: output correct index lines for a split diff | 01 February 2009, 02:07:42 UTC |
| ed096c4 | Junio C Hamano | 01 February 2009, 01:43:59 UTC | Merge branch 'sp/runtime-prefix' * sp/runtime-prefix: Windows: Revert to default paths and convert them by RUNTIME_PREFIX Compute prefix at runtime if RUNTIME_PREFIX is set Modify setup_path() to only add git_exec_path() to PATH Add calls to git_extract_argv0_path() in programs that call git_config_* git_extract_argv0_path(): Move check for valid argv0 from caller to callee Refactor git_set_argv0_path() to git_extract_argv0_path() Move computation of absolute paths from Makefile to runtime (in preparation for RUNTIME_PREFIX) | 01 February 2009, 01:43:59 UTC |
| fa5bc8a | Junio C Hamano | 01 February 2009, 01:43:56 UTC | Merge branch 'jk/signal-cleanup' * jk/signal-cleanup: t0005: use SIGTERM for sigchain test pager: do wait_for_pager on signal death refactor signal handling for cleanup functions chain kill signals for cleanup functions diff: refactor tempfile cleanup handling Windows: Fix signal numbers | 01 February 2009, 01:43:56 UTC |
| 2edefe3 | Junio C Hamano | 01 February 2009, 01:43:28 UTC | Merge branch 'jg/mergetool' * jg/mergetool: mergetool: Don't repeat merge tool candidates | 01 February 2009, 01:43:28 UTC |
| ddebfd1 | Junio C Hamano | 01 February 2009, 01:42:26 UTC | Merge branch 'maint' * maint: merge: fix out-of-bounds memory access | 01 February 2009, 01:42:26 UTC |
| 6ac9229 | Junio C Hamano | 01 February 2009, 01:42:17 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: merge: fix out-of-bounds memory access | 01 February 2009, 01:42:17 UTC |
| 99ccaba | David Aguilar | 31 January 2009, 20:27:56 UTC | contrib/difftool: Don't repeat merge tool candidates git difftool listed some candidates for mergetools twice, depending on the environment. This slightly changes the behavior when both KDE_FULL_SESSION and GNOME_DESKTOP_SESSION_ID are set at the same time; in such a case meld is used in favor of kdiff3 (the old code favored kdiff3 in such a case), but it should not matter in practice. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 February 2009, 01:35:06 UTC |
| 384770a | Markus Heidelberg | 30 January 2009, 23:19:29 UTC | contrib/difftool: add support for Kompare Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Acked-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 February 2009, 01:34:58 UTC |
| 817d14a | Tay Ray Chuan | 30 January 2009, 23:51:55 UTC | http-push: refactor request url creation Introduce two helper functions append_remote_object_url() and get_remote_object_url() and use them to remove various places that allocate and format the URL by hand. These functions generate a URL that point at the fan-out directory inside the remote object store (e.g. http://host/path/to/repo/objects/a1/) or at an individual loose object file. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 February 2009, 01:10:07 UTC |
| c7cddc1 | René Scharfe | 31 January 2009, 14:39:10 UTC | merge: fix out-of-bounds memory access The parameter n of unpack_callback() can have a value of up to MAX_UNPACK_TREES. The check at the top of unpack_trees() (its only (indirect) caller) makes sure it cannot exceed this limit. unpack_callback() passes it and the array src to unpack_nondirectories(), which has this loop: for (i = 0; i < n; i++) { /* ... */ src[i + o->merge] = o->df_conflict_entry; o->merge can be 0 or 1, so unpack_nondirectories() potentially accesses the array src at index MAX_UNPACK_TREES. This patch makes it big enough. Reported-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2009, 18:39:55 UTC |
| ff4a185 | Charles Bailey | 30 January 2009, 23:20:11 UTC | mergetool: fix running mergetool in sub-directories The previous fix to mergetool to use checkout-index instead of cat-file broke running mergetool anywhere except the root of the repository. This fixes it by using the correct relative paths for temporary files and index paths. Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2009, 18:28:33 UTC |
| b9b5078 | Charles Bailey | 30 January 2009, 23:20:10 UTC | mergetool: Add a test for running mergetool in a sub-directory Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2009, 18:18:33 UTC |
| 2182896 | Thomas Rast | 30 January 2009, 22:47:00 UTC | t3412: clean up GIT_EDITOR usage a6c7a27 (rebase -i: correctly remember --root flag across --continue, 2009-01-26) introduced a more portable GIT_EDITOR usage, but left the old tests unchanged. Since we never use the editor (all tests run the rebase script as proposed by rebase -i), just disable it outright, which simplifies the tests. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2009, 05:11:59 UTC |
