Shawn O. Pearce [Mon, 29 Sep 2008 17:04:21 +0000 (10:04 -0700)]
Merge branch 'jc/better-conflict-resolution'
* jc/better-conflict-resolution:
Fix AsciiDoc errors in merge documentation
git-merge documentation: describe how conflict is presented
checkout --conflict=<style>: recreate merge in a non-default style
checkout -m: recreate merge when checking out of unmerged index
git-merge-recursive: learn to honor merge.conflictstyle
merge.conflictstyle: choose between "merge" and "diff3 -m" styles
rerere: understand "diff3 -m" style conflicts with the original
rerere.c: use symbolic constants to keep track of parsing states
xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
xmerge.c: minimum readability fixups
xdiff-merge: optionally show conflicts in "diff3 -m" style
xdl_fill_merge_buffer(): separate out a too deeply nested function
checkout --ours/--theirs: allow checking out one side of a conflicting merge
checkout -f: allow ignoring unmerged paths when checking out of the index
Conflicts:
Documentation/git-checkout.txt
builtin-checkout.c
builtin-merge-recursive.c
t/t7201-co.sh
Nanako Shiraishi [Sat, 27 Sep 2008 11:44:15 +0000 (20:44 +0900)]
Add contrib/rerere-train script
This script takes a range of commits (e.g. maint..next) as its arguments,
recreates merge commits in the range to prime rr-cache database.
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Dmitry Potapov [Sat, 27 Sep 2008 08:39:45 +0000 (12:39 +0400)]
mingw: remove use of _getdrive() from lstat/fstat
The field device is not used by Git, and putting the number of the
current device is meaningless anyway.
Signed-off-by: Dmitry Potapov <dpotapov@gmail.com>
Acked-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Johannes Sixt [Tue, 23 Sep 2008 06:52:16 +0000 (08:52 +0200)]
compat/mingw: Support a timeout in the poll emulation if no fds are given
Our poll() emulation did not support the timeout argument. With this patch
we support it for the simple case where poll() does not need to wait on
file descriptors as well because this case amounts to a mere Sleep().
This is needed if the user sets help.autocorrect is set to a positive
value.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Nanako Shiraishi [Thu, 25 Sep 2008 09:41:04 +0000 (18:41 +0900)]
usage.c: remove unused functions
This removes three functions that are not used anywhere.
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Acked-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Fri, 26 Sep 2008 15:31:56 +0000 (08:31 -0700)]
Merge branch 'maint'
* maint:
Remove empty directories in recursive merge
Documentation: clarify the details of overriding LESS via core.pager
Conflicts:
builtin-merge-recursive.c
Alex Riesen [Fri, 26 Sep 2008 15:21:39 +0000 (08:21 -0700)]
Cleanup remove_path
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Alex Riesen [Thu, 25 Sep 2008 20:12:45 +0000 (22:12 +0200)]
Remove empty directories in recursive merge
The code was actually supposed to do that, but was accidentally broken.
Noticed by Anders Melchiorsen.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Chris Frey [Wed, 24 Sep 2008 23:21:28 +0000 (19:21 -0400)]
Documentation: clarify the details of overriding LESS via core.pager
The process of overriding the default LESS options using only
git-specific methods is rather obscure. Show the end user how
to do it in a step-by-step manner.
Signed-off-by: Chris Frey <cdfrey@foursquare.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Thu, 25 Sep 2008 16:49:19 +0000 (09:49 -0700)]
Merge branch 'mv/merge-recursive'
* mv/merge-recursive:
builtin-merge: release the lockfile in try_merge_strategy()
merge-recursive: get rid of virtual_id
merge-recursive: move current_{file,directory}_set to struct merge_options
merge-recursive: move the global obuf to struct merge_options
merge-recursive: get rid of the index_only global variable
merge-recursive: move call_depth to struct merge_options
cherry-pick/revert: make direct internal call to merge_tree()
builtin-merge: avoid run_command_v_opt() for recursive and subtree
merge-recursive: introduce merge_options
merge-recursive.c: Add more generic merge_recursive_generic()
Split out merge_recursive() to merge-recursive.c
Shawn O. Pearce [Thu, 25 Sep 2008 16:39:24 +0000 (09:39 -0700)]
Merge branch 'jc/alternate-push'
* jc/alternate-push:
push: receiver end advertises refs from alternate repositories
push: prepare sender to receive extended ref information from the receiver
receive-pack: make it a builtin
is_directory(): a generic helper function
Shawn O. Pearce [Thu, 25 Sep 2008 16:32:49 +0000 (09:32 -0700)]
Merge branch 'am/status'
* am/status:
wt-status: Teach how to discard changes in the working directory
wt-status: Split header generation into three functions
Shawn O. Pearce [Thu, 25 Sep 2008 16:23:48 +0000 (09:23 -0700)]
Merge branch 'pb/autocorrect-wrapper'
* pb/autocorrect-wrapper:
git wrapper: also use aliases to correct mistyped commands
Shawn O. Pearce [Thu, 25 Sep 2008 16:16:33 +0000 (09:16 -0700)]
Merge branch 'mv/commit-tree'
* mv/commit-tree:
t7603: add new testcases to ensure builtin-commit uses reduce_heads()
builtin-commit: use commit_tree()
commit_tree(): add a new author parameter
Shawn O. Pearce [Thu, 25 Sep 2008 16:09:41 +0000 (09:09 -0700)]
Merge branch 'jc/apply-include-exclude'
* jc/apply-include-exclude:
git-apply:--include=pathspec
Shawn O. Pearce [Thu, 25 Sep 2008 15:50:01 +0000 (08:50 -0700)]
Merge branch 'jc/safe-c-l-d'
* jc/safe-c-l-d:
safe_create_leading_directories(): make it about "leading" directories
Giuseppe Bilotta [Fri, 8 Aug 2008 14:12:11 +0000 (16:12 +0200)]
gitweb: shortlog now also obeys $hash_parent
If $hash_parent is defined, shortlog now limits the list of commits at
those between $hash_parent (exclusive) and $hash (inclusive).
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Acked-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Thu, 25 Sep 2008 15:41:42 +0000 (08:41 -0700)]
Merge branch 'ho/dirstat-by-file'
* ho/dirstat-by-file:
diff --dirstat-by-file: count changed files, not lines
Shawn O. Pearce [Thu, 25 Sep 2008 15:41:07 +0000 (08:41 -0700)]
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: Reenable staging unmerged files by clicking the icon.
git-gui: Support the encoding menu in gui blame.
git-gui: Optimize encoding name resolution using a lookup table.
git-gui: Allow forcing display encoding for diffs using a submenu.
git-gui: Add a menu of available encodings.
git-gui: Cleanup handling of the default encoding.
git-gui: Assume `blame --incremental` output is in UTF-8
git-gui: Use gitattribute "encoding" for file content display
git-gui: Add support for calling out to the prepare-commit-msg hook
git-gui: Hide commit related UI during citool --nocommit
git-gui: Add more integration options to citool.
git-gui: Updated German translation.
git-gui: I18n fix sentence parts into full sentences for translation again.
git-gui: Restore ability to Stage Working Copy for conflicts.
git-gui: Fix Blame Parent & Context for working copy lines.
Shawn O. Pearce [Thu, 25 Sep 2008 15:27:53 +0000 (08:27 -0700)]
Merge branch 'maint'
* maint:
Update release notes for 1.6.0.3
checkout: Do not show local changes when in quiet mode
for-each-ref: Fix --format=%(subject) for log message without newlines
git-stash.sh: don't default to refs/stash if invalid ref supplied
maint: check return of split_cmdline to avoid bad config strings
Shawn O. Pearce [Thu, 25 Sep 2008 15:27:41 +0000 (08:27 -0700)]
Update release notes for 1.6.0.3
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Johan Herland [Mon, 22 Sep 2008 16:08:31 +0000 (18:08 +0200)]
Fix submodule sync with relative submodule URLs
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Nanako Shiraishi [Thu, 25 Sep 2008 09:41:08 +0000 (18:41 +0900)]
graph.c: make many functions static
These function are not used anywhere. Also removes graph_release()
that is never called.
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Nanako Shiraishi [Thu, 25 Sep 2008 09:41:00 +0000 (18:41 +0900)]
remote.c: make free_ref(), parse_push_refspec() and free_refspecs() static.
These functions are not used by any other file.
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Jonas Fonseca [Thu, 25 Sep 2008 08:35:38 +0000 (10:35 +0200)]
checkout: Do not show local changes when in quiet mode
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Johan Herland [Wed, 24 Sep 2008 23:10:54 +0000 (01:10 +0200)]
for-each-ref: Fix --format=%(subject) for log message without newlines
'git for-each-ref --format=%(subject)' currently returns an empty string
if the log message does not contain a newline.
This patch teaches 'git for-each-ref' to return the entire log message
(instead of an empty string) if there is no newline in the log message.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Petr Baudis [Wed, 24 Sep 2008 21:52:39 +0000 (23:52 +0200)]
git-web--browse: Support for using /bin/start on MinGW
In the future, I think we should also default to xdg-open on Linux instead
of having a KDE-specific hack.
This patch has been sponsored by Novartis.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Alexander Gavrilov [Sat, 20 Sep 2008 08:19:18 +0000 (12:19 +0400)]
git-gui: Reenable staging unmerged files by clicking the icon.
This restores functionality of the file icon for unmerged files.
Safety is enforced by loading the diff and checking for lines
that look like conflict markers. If such lines are found, or
the conflict involves deletion and/or symlinks, a confirmation
dialog is presented. Otherwise, the icon immediately stages the
working copy version of the file.
Includes a revert of
2fe5b2ee42897a3acc78e5ddaace3775eb2713ca
(Restore ability to Stage Working Copy for conflicts)
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Tested-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Alexander Gavrilov [Wed, 17 Sep 2008 21:07:36 +0000 (01:07 +0400)]
git-gui: Support the encoding menu in gui blame.
Allow dynamically changing the encoding from the blame
viewer as well.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Tested-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Alexander Gavrilov [Wed, 17 Sep 2008 21:07:35 +0000 (01:07 +0400)]
git-gui: Optimize encoding name resolution using a lookup table.
Encoding menu construction does almost a hundred of encoding
resolutions, which with the old implementation led to a
small but noticeable delay.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Tested-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Alexander Gavrilov [Wed, 17 Sep 2008 21:07:34 +0000 (01:07 +0400)]
git-gui: Allow forcing display encoding for diffs using a submenu.
Add a submenu to allow dynamically changing the encoding to use
for diffs. Encoding settings are remembered while git-gui runs.
The rules are:
1) Encoding set for a specific file overrides gitattributes.
2) Last explicitly set value of the encoding overrides gui.encoding
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Tested-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Alexander Gavrilov [Wed, 17 Sep 2008 21:07:33 +0000 (01:07 +0400)]
git-gui: Add a menu of available encodings.
To make encoding selection easier, add a menu that
lists available encodings to the Options window.
Menu structure is borrowed from Firefox.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Tested-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Alexander Gavrilov [Wed, 17 Sep 2008 21:07:32 +0000 (01:07 +0400)]
git-gui: Cleanup handling of the default encoding.
- Make diffs and blame default to the system (locale)
encoding instead of hard-coding UTF-8.
- Add a gui.encoding option to allow overriding it.
- gitattributes still have the final word.
The rationale for this is Windows support:
1) Windows people are accustomed to using legacy encodings
for text files. For many of them defaulting to utf-8
will be counter-intuitive.
2) Windows doesn't support utf-8 locales, and switching
the system encoding is a real pain. Thus the option.
This patch also adds proper encoding conversion to Apply Hunk/Line.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Tested-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Wed, 23 Jan 2008 05:39:50 +0000 (00:39 -0500)]
git-gui: Assume `blame --incremental` output is in UTF-8
Most commits have author name encoded in UTF-8, but the incremental
blame output dumps raw bytes and doesn't give us the encoding header
from the commit. Rather than fixing up tooltip data after we have
viewed that particular commit in the blame viewer we can assume all
names are in UTF-8.
This is still going to cause problems when the author name is not
encoded in UTF-8, but the only (efficient) way to solve that is to
add an "encoding" header to the blame --incremental mode output,
as otherwise we need to run `git cat-file commit $sha1` for each
and every commit identified and that would be horribly expensive
on any platform.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Wed, 23 Jan 2008 05:37:10 +0000 (00:37 -0500)]
git-gui: Use gitattribute "encoding" for file content display
Most folks using git-gui on internationalized files have complained
that it doesn't recognize UTF-8 correctly. In the past we have just
ignored the problem and showed the file contents as binary/US-ASCII,
which is wrong no matter how you look at it.
This really should be a per-file attribute, managed by .gitattributes,
so we now pull the "encoding" attribute data for the given path from
the .gitattributes (if available) and use that, falling back to UTF-8
if the attributes are unavailable, git-check-attr is broken, or an
encoding for this path not specified.
We apply the encoding anytime we show file content, which currently
is limited to only the diff viewer and the blame viewer.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Joshua Williams [Wed, 24 Sep 2008 19:11:53 +0000 (14:11 -0500)]
git-gui: Add support for calling out to the prepare-commit-msg hook
Signed-off-by: Joshua Williams <joshua.williams@qlogic.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Wed, 24 Sep 2008 16:48:20 +0000 (09:48 -0700)]
git-gui: Hide commit related UI during citool --nocommit
If the user started git-gui as "git citool --nocommit" then they
don't need the new commit / amend commit radio buttons, or the sign
off button in the UI. Rather than use up space with options the
user cannot activate they are simply not installed into the UI.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Alexander Gavrilov [Fri, 12 Sep 2008 18:43:49 +0000 (22:43 +0400)]
git-gui: Add more integration options to citool.
- Make citool return nonzero exit code if it did not commit.
- Add a mode where it does not actually commit and simply
exits with zero code. Commit message is either disabled,
or simply dumped to GITGUI_EDITMSG before exiting.
- Add an option to immediately start it in amend mode.
Rationale:
1) Use 'git citool --nocommit' instead of mergetool in scripts.
2) Use 'git citool --amend' to edit commits while rebasing.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Brandon Casey [Tue, 23 Sep 2008 23:57:09 +0000 (18:57 -0500)]
git-stash.sh: don't default to refs/stash if invalid ref supplied
apply_stash() and show_stash() each call rev-parse with
'--default refs/stash' as an argument. This option causes rev-parse to
operate on refs/stash if it is not able to successfully operate on any
element of the command line. This includes failure to supply a "valid"
revision. This has the effect of causing 'stash apply' and 'stash show'
to operate as if stash@{0} had been supplied when an invalid revision is
supplied.
e.g. 'git stash apply stash@{1}' would fall back to
'git stash apply stash@{0}'
This patch modifies these two functions so that they avoid using the
--default option of rev-parse.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Garry Dolley [Wed, 24 Sep 2008 09:51:27 +0000 (02:51 -0700)]
Fixed some grammatical errors in git-rebase.txt documentation.
Generally, the dependent clause "for example" is suffixed with a comma.
Used present tense where appropriate to be consistent with the other
paragraphs.
Rewrote the paragraph in the second hunk to be more clear.
Signed-off-by: Garry Dolley <gdolley@ucla.edu>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Deskin Miller [Mon, 22 Sep 2008 15:06:41 +0000 (11:06 -0400)]
maint: check return of split_cmdline to avoid bad config strings
As the testcase demonstrates, it's possible for split_cmdline to return -1 and
deallocate any memory it's allocated, if the config string is missing an end
quote. In both the cases below, which are the only calling sites, the return
isn't checked, and using the pointer causes a pretty immediate segfault.
Signed-off-by: Deskin Miller <deskinm@umich.edu>
Acked-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Junio C Hamano [Tue, 23 Sep 2008 09:05:35 +0000 (02:05 -0700)]
Merge branch 'maint'
* maint:
builtin-prune.c: prune temporary packs in <object_dir>/pack directory
Do not perform cross-directory renames when creating packs
Brandon Casey [Mon, 22 Sep 2008 23:34:26 +0000 (18:34 -0500)]
builtin-prune.c: prune temporary packs in <object_dir>/pack directory
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Petr Baudis [Mon, 22 Sep 2008 17:20:21 +0000 (19:20 +0200)]
Do not perform cross-directory renames when creating packs
A comment on top of create_tmpfile() describes caveats ('can have
problems on various systems (FAT, NFS, Coda)') that should apply
in this situation as well. This in the end did not end up solving
any of my personal problems, but it might be a useful cleanup patch
nevertheless.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 22 Sep 2008 16:41:43 +0000 (09:41 -0700)]
Merge branch 'maint'
* maint:
Use dashless git commands in setgitperms.perl
git-remote: do not use user input in a printf format string
Todd Zullinger [Mon, 22 Sep 2008 11:30:08 +0000 (07:30 -0400)]
Use dashless git commands in setgitperms.perl
Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt [Mon, 22 Sep 2008 11:03:25 +0000 (13:03 +0200)]
git-remote: do not use user input in a printf format string
'git remote show' substituted the remote name into a string that was later
used as a printf format string. If a remote name contains a printf format
specifier like this:
$ git remote add foo%sbar .
then the command
$ git remote show foo%sbar
would print garbage (if you are lucky) or crash. This fixes it.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Deskin Miller [Tue, 16 Sep 2008 01:12:58 +0000 (21:12 -0400)]
git-svn: do a partial rebuild if rev_map is out-of-date
Suppose you're using git-svn to work with a certain SVN repository.
Since you don't like 'git-svn fetch' to take forever, and you don't want
to accidentally interrupt it and end up corrupting your repository, you
set up a remote Git repository to mirror the SVN repository, which does
its own 'git-svn fetch' on a cronjob; now you can 'git-fetch' from the
Git mirror into your local repository, and still dcommit to SVN when you
have changes to push.
After you do this, though, git-svn will get very confused if you ever
try to do 'git-svn fetch' in your local repository again, since its
rev_map will differ from the branch's head, and it will be unable to
fetch new commits from SVN because of the metadata conflict. But all
the necessary metadata are there in the Git commit message; git-svn
already knows how to rebuild rev_map files that get blown away, by
using the metadata.
This patch teaches git-svn do a partial rebuild of the rev_map to
match the true state of the branch, if it ever is used to fetch again.
This will only work for projects not using either noMetadata or
useSvmProps configuration options; if you are using these options,
git-svn will fall back to the previous behaviour.
Signed-off-by: Deskin Miller <deskinm@umich.edu>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Deskin Miler [Thu, 18 Sep 2008 21:55:14 +0000 (17:55 -0400)]
git-svn: testcase for partial rebuild
[jc: use expect_failure to mark the test to expose existing breakage]
Signed-off-by: Deskin Miller <deskinm@umich.edu>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 22 Sep 2008 06:50:05 +0000 (23:50 -0700)]
Merge branch 'db/maint-checkout-b'
* db/maint-checkout-b:
Check early that a new branch is new and valid
Junio C Hamano [Mon, 22 Sep 2008 06:50:01 +0000 (23:50 -0700)]
t5510: test "git fetch" following tags minimally
When "git fetch" auto-follows tags, it should not download excess ones.
This new test makes sure that condition.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Daniel Barkalow [Sun, 21 Sep 2008 18:36:06 +0000 (14:36 -0400)]
Check early that a new branch is new and valid
If you fail to update refs to change branches in checkout, your index
and working tree are left already updated. We don't have an easy way
to undo this, but at least we can check things that would make the
creation of a new branch fail. These checks were in the shell version,
and were lost in the C conversion.
The messages are from the shell version, and should probably be made nicer.
[jc: added test to t7201]
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Sat, 20 Sep 2008 08:01:30 +0000 (01:01 -0700)]
Update draft release notes to 1.6.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Sat, 20 Sep 2008 06:15:44 +0000 (23:15 -0700)]
Merge branch 'maint'
* maint:
Start draft release notes for 1.6.0.3
git-repack uses --no-repack-object, not --no-repack-delta.
Typo "bogos" in format-patch error message.
builtin-clone: fix typo
Bust the ghost of long-defunct diffcore-pathspec.
completion: git commit should list --interactive
Conflicts:
RelNotes
Junio C Hamano [Sat, 20 Sep 2008 06:15:13 +0000 (23:15 -0700)]
Start draft release notes for 1.6.0.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mikael Magnusson [Fri, 19 Sep 2008 13:43:48 +0000 (15:43 +0200)]
git-repack uses --no-repack-object, not --no-repack-delta.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mikael Magnusson [Fri, 19 Sep 2008 13:42:30 +0000 (15:42 +0200)]
Typo "bogos" in format-patch error message.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Fabrizio Chiarello [Fri, 19 Sep 2008 12:07:26 +0000 (14:07 +0200)]
builtin-clone: fix typo
Signed-off-by: Fabrizio Chiarello <ponch@autistici.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Yann Dirson [Fri, 19 Sep 2008 20:12:53 +0000 (22:12 +0200)]
Bust the ghost of long-defunct diffcore-pathspec.
This concept was retired by
77882f6 (Retire diffcore-pathspec.,
2006-04-10), more than 2 years ago.
Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
SZEDER Gábor [Fri, 19 Sep 2008 22:15:25 +0000 (00:15 +0200)]
bash: use for-each-ref format 'refname:short'
Using this format simplifies the code for completing refs and (in some
cases) improves performance significantly.
For repositories like the current git.git (with more than 200 refs)
there is no real performance difference, but for a repository with 2000
refs the total time needed to complete the refs is reduced by ~25% (from
around 400ms to around 305ms).
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Raible [Thu, 11 Sep 2008 00:40:20 +0000 (17:40 -0700)]
completion: git commit should list --interactive
Signed-off-by: Eric Raible <raible@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 19 Sep 2008 03:30:12 +0000 (20:30 -0700)]
Merge branch 'maint'
* maint:
sha1_file: link() returns -1 on failure, not errno
Make git archive respect core.autocrlf when creating zip format archives
Add new test to demonstrate git archive core.autocrlf inconsistency
gitweb: avoid warnings for commits without body
Clarified gitattributes documentation regarding custom hunk header.
git-svn: fix handling of even funkier branch names
git-svn: Always create a new RA when calling do_switch for svn://
git-svn: factor out svnserve test code for later use
diff/diff-files: do not use --cc too aggressively
Junio C Hamano [Fri, 19 Sep 2008 03:30:07 +0000 (20:30 -0700)]
Merge branch 'jc/diff-prefix'
* jc/diff-prefix:
diff: vary default prefix depending on what are compared
Junio C Hamano [Fri, 19 Sep 2008 03:19:30 +0000 (20:19 -0700)]
Merge branch 'np/pack'
* np/pack:
t5300: improve SHA1 collision test
pack-objects: don't include missing preferred base objects
sha1write: don't copy full sized buffers
Conflicts:
t/t5300-pack-object.sh
Junio C Hamano [Fri, 19 Sep 2008 03:18:44 +0000 (20:18 -0700)]
Merge branch 'bw/shortref'
* bw/shortref:
for-each-ref: `:short` format for `refname`
Junio C Hamano [Fri, 19 Sep 2008 03:18:41 +0000 (20:18 -0700)]
Merge branch 'rs/decorate'
* rs/decorate:
add '%d' pretty format specifier to show decoration
move load_ref_decorations() to log-tree.c and export it
log: add load_ref_decorations()
Junio C Hamano [Fri, 19 Sep 2008 03:18:37 +0000 (20:18 -0700)]
Merge branch 'tr/rev-list-reverse'
* tr/rev-list-reverse:
t6013: replace use of 'tac' with equivalent Perl
rev-list: fix --reverse interaction with --parents
Junio C Hamano [Fri, 19 Sep 2008 03:18:32 +0000 (20:18 -0700)]
Merge branch 'cc/bisect'
* cc/bisect:
bisect: remove "checkout_done" variable used when checking merge bases
bisect: only check merge bases when needed
bisect: test merge base if good rev is not an ancestor of bad rev
Junio C Hamano [Fri, 19 Sep 2008 03:18:27 +0000 (20:18 -0700)]
Merge branch 'jc/setlinebuf-setvbuf'
* jc/setlinebuf-setvbuf:
daemon.c: avoid setlinebuf()
Junio C Hamano [Fri, 19 Sep 2008 02:53:25 +0000 (19:53 -0700)]
Merge branch 'dp/maint-rebase-fix' into maint
* dp/maint-rebase-fix:
git-rebase--interactive: auto amend only edited commit
git-rebase-interactive: do not squash commits on abort
Junio C Hamano [Fri, 19 Sep 2008 02:53:22 +0000 (19:53 -0700)]
Merge branch 'jc/maint-checkout-keep-remove' into maint
* jc/maint-checkout-keep-remove:
checkout: do not lose staged removal
Junio C Hamano [Fri, 19 Sep 2008 02:53:12 +0000 (19:53 -0700)]
Merge branch 'jc/maint-diff-quiet' into maint
* jc/maint-diff-quiet:
diff --quiet: make it synonym to --exit-code >/dev/null
diff Porcelain: do not disable auto index refreshing on -C -C
Junio C Hamano [Fri, 19 Sep 2008 02:53:06 +0000 (19:53 -0700)]
Merge branch 'jc/maint-name-hash-clear' into maint
* jc/maint-name-hash-clear:
discard_cache: reset lazy name_hash bit
Junio C Hamano [Fri, 19 Sep 2008 02:53:01 +0000 (19:53 -0700)]
Merge branch 'jc/maint-template-permbits' into maint
* jc/maint-template-permbits:
Fix permission bits on sources checked out with an overtight umask
Junio C Hamano [Fri, 19 Sep 2008 02:52:57 +0000 (19:52 -0700)]
Merge branch 'mh/maint-honor-no-ssl-verify' into maint
* mh/maint-honor-no-ssl-verify:
Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
Thomas Rast [Thu, 18 Sep 2008 22:24:46 +0000 (00:24 +0200)]
sha1_file: link() returns -1 on failure, not errno
5723fe7 (Avoid cross-directory renames and linking on object creation,
2008-06-14) changed the call to use link() directly instead of through a
custom wrapper, but forgot that it returns 0 or -1, not 0 or errno.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Charles Bailey [Thu, 18 Sep 2008 20:01:20 +0000 (21:01 +0100)]
Make git archive respect core.autocrlf when creating zip format archives
There is currently no call to git_config at the start of cmd_archive.
When creating tar archives the core config is read as a side-effect of
reading the tar specific config, but this doesn't happen for zip
archives.
The consequence is that in a configuration with core.autocrlf set,
although files in a tar archive are created with crlf line endings,
files in a zip archive retain unix line endings.
Signed-off-by: Charles Bailey <charles@hashpling.org>
Acked-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Charles Bailey [Thu, 18 Sep 2008 20:01:13 +0000 (21:01 +0100)]
Add new test to demonstrate git archive core.autocrlf inconsistency
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Joey Hess [Fri, 5 Sep 2008 18:26:29 +0000 (14:26 -0400)]
gitweb: avoid warnings for commits without body
In the unusual case when there is no commit message, gitweb would
output an uninitialized value warning.
Signed-off-by: Joey Hess <joey@kitenet.net>
Acked-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Garry Dolley [Wed, 17 Sep 2008 06:20:39 +0000 (23:20 -0700)]
Clarified gitattributes documentation regarding custom hunk header.
The only part of the hunk header that we can change is the "TEXT"
portion. Additionally, a few grammatical errors have been corrected.
Signed-off-by: Garry Dolley <gdolley@ucla.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Wong [Sun, 7 Sep 2008 03:18:18 +0000 (20:18 -0700)]
git-svn: fix handling of even funkier branch names
Apparently do_switch() tolerates the lack of escaping in less
funky branch names. For the really strange and scary ones, we
need to escape them properly. It strangely maintains compatible
with the existing handling of branch names with spaces and
exclamation marks.
Reported-by: m.skoric@web.de ($gmane/94677)
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Alec Berryman [Sun, 14 Sep 2008 21:14:16 +0000 (17:14 -0400)]
git-svn: Always create a new RA when calling do_switch for svn://
Not doing so caused the "Malformed network data" error when a directoy
was deleted and replaced with a copy from an older version.
Signed-off-by: Alec Berryman <alec@thened.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Alec Berryman [Sun, 14 Sep 2008 21:14:15 +0000 (17:14 -0400)]
git-svn: factor out svnserve test code for later use
Signed-off-by: Alec Berryman <alec@thened.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 18 Sep 2008 07:32:37 +0000 (00:32 -0700)]
diff/diff-files: do not use --cc too aggressively
Textual diff output for unmerged paths was too eager to give condensed
combined diff. Even though "diff -c" (and "diff-files -c -p") is a
request to view combined diff without condensing (otherwise the user would
have explicitly asked for --cc, not -c), we showed "--cc" output anyway.
0fe7c1d (built-in diff: assorted updates, 2006-04-29) claimed to be
careful about doing this, but its breakage was hidden because back then
"git diff" was still a shell script that did not use the codepath it
introduced fully.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Tue, 16 Sep 2008 08:24:58 +0000 (01:24 -0700)]
Merge branch 'maint'
* maint:
Cosmetical command name fix
Start conforming code to "git subcmd" style part 3
t9700/test.pl: remove File::Temp requirement
t9700/test.pl: avoid bareword 'STDERR' in 3-argument open()
Junio C Hamano [Tue, 16 Sep 2008 07:50:57 +0000 (00:50 -0700)]
Merge branch 'dp/maint-rebase-fix'
* dp/maint-rebase-fix:
git-rebase--interactive: auto amend only edited commit
git-rebase-interactive: do not squash commits on abort
Junio C Hamano [Tue, 16 Sep 2008 07:49:59 +0000 (00:49 -0700)]
Merge branch 'jc/maint-checkout-keep-remove'
* jc/maint-checkout-keep-remove:
checkout: do not lose staged removal
Junio C Hamano [Tue, 16 Sep 2008 07:48:16 +0000 (00:48 -0700)]
Merge branch 'jc/maint-diff-quiet'
* jc/maint-diff-quiet:
diff --quiet: make it synonym to --exit-code >/dev/null
diff Porcelain: do not disable auto index refreshing on -C -C
Junio C Hamano [Tue, 16 Sep 2008 07:47:52 +0000 (00:47 -0700)]
Merge branch 'jc/maint-name-hash-clear'
* jc/maint-name-hash-clear:
discard_cache: reset lazy name_hash bit
Junio C Hamano [Tue, 16 Sep 2008 07:47:30 +0000 (00:47 -0700)]
Merge branch 'jc/maint-template-permbits'
* jc/maint-template-permbits:
Fix permission bits on sources checked out with an overtight umask
Junio C Hamano [Tue, 16 Sep 2008 07:46:36 +0000 (00:46 -0700)]
Merge branch 'mh/maint-honor-no-ssl-verify'
* mh/maint-honor-no-ssl-verify:
Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
Heikki Orsila [Sat, 13 Sep 2008 16:31:31 +0000 (19:31 +0300)]
Cosmetical command name fix
If we came from git.c the first arg would be "archive".
"git-archive" isn't a bug because cmd_archive() doesn't check
the first arg.
Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Heikki Orsila [Sat, 13 Sep 2008 17:18:36 +0000 (20:18 +0300)]
Start conforming code to "git subcmd" style part 3
User notifications are presented as 'git cmd', and code comments
are presented as '"cmd"' or 'git's cmd', rather than 'git-cmd'.
Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Casey [Mon, 15 Sep 2008 16:25:22 +0000 (11:25 -0500)]
t9700/test.pl: remove File::Temp requirement
The object oriented version of File::Temp is a rather new incarnation it
seems. The File::Temp man page for v5.8.0 says "(NOT YET IMPLEMENTED)" in
the 'Objects' section. Instead of creating a file with a unique name in
the system TMPDIR, we can create our own temporary file with a static
name and use that instead.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Tested-by: Tom G. Christensen <tgc@statsbiblioteket.dk> on RHEL 3, Perl 5.8.0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Casey [Mon, 15 Sep 2008 16:23:24 +0000 (11:23 -0500)]
t9700/test.pl: avoid bareword 'STDERR' in 3-argument open()
Some versions of perl complain when 'STDERR' is used as the third argument
in the 3-argument form of open(). Convert to the 2-argument form which is
described for duping STDERR in my second edition camel book.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Tested-by: Tom G. Christensen <tgc@statsbiblioteket.dk> on RHEL 3, Perl 5.8.0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Quy Tonthat [Fri, 12 Sep 2008 16:22:44 +0000 (02:22 +1000)]
Update RPM spec for the new location of git-cvsserver.
git-cvsserver has been moved from libexecdir to bindir.
Signed-off-by: Quy Tonthat <qtonthat@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Christian Stimming [Sat, 13 Sep 2008 08:24:47 +0000 (10:24 +0200)]
git-gui: Updated German translation.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Junio C Hamano [Sat, 13 Sep 2008 00:20:39 +0000 (17:20 -0700)]
Sync with 1.6.0.2
Junio C Hamano [Fri, 12 Sep 2008 23:18:47 +0000 (16:18 -0700)]
GIT 1.6.0.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 12 Sep 2008 23:15:23 +0000 (16:15 -0700)]
Merge branch 'ho/maint-dashless' into maint
* ho/maint-dashless:
Start conforming code to "git subcmd" style part 2