summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-02-07GIT 1.6.2-rc0v1.6.2-rc0Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-02-07Merge branch 'tr/add-p-single'Junio C Hamano
* tr/add-p-single: add -p: import Term::ReadKey with 'require' add -p: print errors in separate color add -p: prompt for single characters
2009-02-07Merge branch 'js/filter-branch-submodule'Junio C Hamano
* js/filter-branch-submodule: filter-branch: do not consider diverging submodules a 'dirty worktree' filter-branch: Fix fatal error on bare repositories
2009-02-07Merge branch 'maint'Junio C Hamano
* maint: GIT 1.6.1.3 Conflicts: GIT-VERSION-GEN RelNotes
2009-02-07emacs: Remove the no longer maintained vc-git package.Alexandre Julliard
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>
2009-02-07git.el: Add some notes about Emacs versions compatibility.Alexandre Julliard
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2009-02-07git.el: Use integer instead of character constants in case statement.Alexandre Julliard
This is for compatibility with XEmacs. Reported by Vassili Karpov. Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2009-02-07git.el: Set a regexp for paragraph-separate in log-edit mode.Alexandre Julliard
This allows using fill-paragraph on the log message without interference from the various header fields. Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2009-02-07git.el: Make git-run-command-region display the error if any.Alexandre Julliard
This makes it easier to figure out why a commit has failed. Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2009-02-07git.el: Add commands for cherry-pick and revert.Alexandre Julliard
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>
2009-02-07git.el: Add a command to create a new branch.Alexandre Julliard
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>
2009-02-07git.el: Add a checkout command.Alexandre Julliard
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>
2009-02-07GIT 1.6.1.3v1.6.1.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-02-07add -p: import Term::ReadKey with 'require'Thomas Rast
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>
2009-02-05Merge branch 'js/maint-remote-remove-mirror'Junio C Hamano
* 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
2009-02-05Merge branch 'js/notes'Junio C Hamano
* 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
2009-02-05Merge branch 'jc/refuse-push-to-current'Junio C Hamano
* jc/refuse-push-to-current: receive-pack: explain what to do when push updates the current branch
2009-02-05Merge branch 'rc/http-push'Junio C Hamano
* 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
2009-02-05Merge branch 'gt/utf8-width'Junio C Hamano
* gt/utf8-width: builtin-blame.c: Use utf8_strwidth for author's names utf8: add utf8_strwidth()
2009-02-05Merge branch 'jk/head-symref'Junio C Hamano
* jk/head-symref: symbolic ref: refuse non-ref targets in HEAD validate_headref: tighten ref-matching to just branches
2009-02-05Merge branch 'cb/mergetool'Junio C Hamano
* 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
2009-02-05Merge branch 'maint'Junio C Hamano
* maint: Fixed broken git help -w when installing from RPM
2009-02-05Merge branch 'maint-1.6.0' into maintJunio C Hamano
* maint-1.6.0: Fixed broken git help -w when installing from RPM
2009-02-05Merge branch 'jc/maint-apply-fix' into maintJunio C Hamano
* jc/maint-apply-fix: builtin-apply.c: do not set bogus mode in check_preimage() for deleted path
2009-02-05Merge branch 'am/maint-push-doc' into maintJunio C Hamano
* am/maint-push-doc: Documentation: rework src/dst description in git push Documentation: more git push examples Documentation: simplify refspec format description
2009-02-05Merge branch 'sg/maint-gitdir-in-subdir' into maintJunio C Hamano
* sg/maint-gitdir-in-subdir: Fix gitdir detection when in subdir of gitdir
2009-02-05Merge branch 'lt/maint-wrap-zlib' into maintJunio C Hamano
* lt/maint-wrap-zlib: Wrap inflate and other zlib routines for better error reporting Conflicts: http-push.c http-walker.c sha1_file.c
2009-02-05Merge branch 'jc/maint-split-diff-metainfo' into maintJunio C Hamano
* jc/maint-split-diff-metainfo: diff.c: output correct index lines for a split diff
2009-02-05Merge branch 'js/maint-all-implies-HEAD' into maintJunio C Hamano
* js/maint-all-implies-HEAD: bundle: allow the same ref to be given more than once revision walker: include a detached HEAD in --all
2009-02-05Merge branch 'kc/maint-diff-bwi-fix' into maintJunio C Hamano
* kc/maint-diff-bwi-fix: Fix combined use of whitespace ignore options to diff test more combinations of ignore-whitespace options to diff
2009-02-05filter-branch: do not consider diverging submodules a 'dirty worktree'Johannes Schindelin
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>
2009-02-05add -p: print errors in separate colorThomas Rast
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>
2009-02-05add -p: prompt for single charactersThomas Rast
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>
2009-02-05Makefile: minor improvements for Mac OS X (Darwin)Jay Soffian
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>
2009-02-05config.mak.in: define paths without trailing slashPascal Obry
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>
2009-02-05Makefile: fix misdetection of relative pathnamesJunio C Hamano
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>
2009-02-04Fixed broken git help -w when installing from RPMDavid J. Mellor
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>
2009-02-04Merge branch 'jc/fsck' (early part)Junio C Hamano
* 'jc/fsck' (early part): fsck: check loose objects from alternate object stores by default fsck: HEAD is part of refs
2009-02-04builtin-blame.c: Use utf8_strwidth for author's namesGeoffrey Thomas
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>
2009-02-04utf8: add utf8_strwidth()Geoffrey Thomas
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>
2009-02-04git-bundle doc: update examplesNanako Shiraishi
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>
2009-02-04Replace deprecated dashed git commands in usageAlexander Potashev
Signed-off-by: Alexander Potashev <aspotashev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-02-04git-show-branch doc: show -g as synonym to --reflog in the listjidanni@jidanni.org
Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-02-04contrib git-resurrect: find traces of a branch name and resurrect itThomas Rast
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>
2009-02-04Merge branch 'maint'Junio C Hamano
* 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.
2009-02-04Merge branch 'wp/add-patch-find'Junio C Hamano
* 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
2009-02-04Merge branch 'ns/am-slacker'Junio C Hamano
* ns/am-slacker: git-am: Add --ignore-date option am: Add --committer-date-is-author-date option Conflicts: git-am.sh
2009-02-04urls.txt: document optional port specification in git URLSStefan Naewe
Signed-off-by: Stefan Naewe <stefan.naewe+git@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-02-04Merge branch 'maint-1.6.0' into maintJunio C Hamano
* 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.
2009-02-04builtin-mv.c: check for unversionned files before looking at the destination.Matthieu Moy
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>
generated by cgit v1.3 (git 2.53.0) at 2026-04-15 02:51:24 +0000