OSDN Git Service
Junio C Hamano [Tue, 13 Dec 2005 23:58:00 +0000 (15:58 -0800)]
git-clone: tell the user a bit more about clone-pack failure.
When clone-pack has trouble with the remote, it dies unfriendly
"EOF" error message. We cannot tell the reason why it failed
from the local end; it could be that the repository did not
exist, or configured not to serve over git-daemon, or a network
failure. At least, saying clone-pack failed makes it a bit more
meaningful.
I am not convinced yet that removing the newly created directory
is the right thing to do, so this commit leaves the new
directory behind.
Reported by Sam Ravnborg.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 13 Dec 2005 10:38:24 +0000 (02:38 -0800)]
Documentation: not learning core git commands.
The initial section of tutorial was too heavy on internal
workings for the first-time readers, so rewrite the introductory
section of git(7) to start with "not learning core git commands"
section and refer them to README to grasp the basic concepts,
then Everyday to give overview with task/role oriented examples
for minimum set of commands, and finally the tutorial.
Also add to existing note in the tutorial that many too
technical descriptions can be skipped by a casual reader.
I initially started to review the tutorial, with the objective
of ripping out the detailed technical information altogether,
but I found that the level of details in the initial couple of
sections that talk about refs and the object database in a
hands-on fashion was about rigth, and left all of them there. I
feel that reading about fsck-index and repack is too abstract
without being aware of these directories and files.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 13 Dec 2005 09:54:15 +0000 (01:54 -0800)]
Documentation: diff examples.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 13 Dec 2005 07:55:09 +0000 (23:55 -0800)]
Documentation: fix missing links to git(7)
Also move pack protocol description to technical/.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 13 Dec 2005 07:24:06 +0000 (23:24 -0800)]
Documentation: more examples.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 13 Dec 2005 02:29:53 +0000 (18:29 -0800)]
Everyday: a bit more example.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 13 Dec 2005 01:15:55 +0000 (17:15 -0800)]
diffcore-break: do not break too small filepair.
Somehow we checked only one side and not the other. By checking
the filesize upfront, we can bypass generating delta
unnecessarily.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 13 Dec 2005 00:43:15 +0000 (16:43 -0800)]
Revert "Add deltifier test."
This reverts
e726715a52e25d8035c89d4ea09398599610737e commit,
because reverting diff-delta emptiness change would break this test.
Junio C Hamano [Tue, 13 Dec 2005 00:42:38 +0000 (16:42 -0800)]
Revert "diff-delta.c: allow delta with empty blob."
This reverts
962537a3eb03a118cf27d9d0da365a3216ed1caa commit to
play safe.
Junio C Hamano [Tue, 13 Dec 2005 00:20:21 +0000 (16:20 -0800)]
Everyday: some examples.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 12 Dec 2005 20:01:52 +0000 (12:01 -0800)]
diff-delta.c: allow delta with empty blob.
Delta computation with an empty blob used to punt and returned NULL.
This commit allows creation with empty blob; all combination of
empty->empty, empty->something, and something->empty are allowed.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 12 Dec 2005 20:28:34 +0000 (12:28 -0800)]
Add deltifier test.
This test kicks in only if you built test-delta executable, and
makes sure that the basic delta routine is working properly even
on empty files.
This commit is to make sure we have a test to catch the
breakage. The delitifier code is still broken, which will be
fixed with the next commit.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 12 Dec 2005 20:50:40 +0000 (12:50 -0800)]
diffcore-break.c: check diff_delta() return value.
This bug caused Darrin Thompson to notice that our deltifier was
half broken and punting on an empty blob.
Signed-off-by: Junio C Hamano <junio@twinsun.com>
Junio C Hamano [Sun, 11 Dec 2005 20:44:46 +0000 (12:44 -0800)]
t/t6022: a new test for renaming merge.
This adds a couple of tests to cover the following renaming
merge cases:
- one side renames and the other side does not, with and without
content conflicts.
- both side rename to the same path, with and without content
conflicts.
The test setup also prepares a case in which both side rename to
different destination, but currently the code collapses these
destination paths and removes the original path, which may be
wrong. The outcome of this case is not checked by the tests in
this round.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 11 Dec 2005 09:55:52 +0000 (01:55 -0800)]
merge-recursive: cleanup setIndexStages
Fredrik points out there is a useful wrapper runProgram() used
everywhere that we can use to feed input into subprocess. Use
it to catch errors from the subprocess; it is a good cleanup as
well.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 11 Dec 2005 06:05:01 +0000 (22:05 -0800)]
merge-recursive: leave unmerged entries in the index.
This does two things.
- When one branch renamed and the other branch did not, the
resulting half-merged file in the working tree used to swap
branches around and showed as if renaming side was "ours".
This was confusing and inconsistent (even though the conflict
markers were marked with branch names, it was not a good
enough excuse). This changes the order of arguments to
mergeFile in such a case to make sure we always see "our"
change between <<< and ===, and "their" change between ===
and >>>.
- When both branches renamed to the same path, and when one
branch renamed and the other branch did not, we attempt
mergeFile. When this automerge conflicted, we used to
collapse the index. Now we use update-index --index-info
to inject higher stage entries to leave the index in unmerged
state for these two cases.
What this still does _not_ do is to inject unmerged state into
the index when the structural changes conflict. I have not
thought things through what to do in each case yet, but the
cases this commit cover are the most common ones, so this would
be a good start.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 11 Dec 2005 06:22:35 +0000 (22:22 -0800)]
format-patch: use same number of digits in numbers
This would help sorting by subject in MUA work saner even though
MUA is too dumb to attempt sorting numbered subjects sanely.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 11 Dec 2005 04:55:32 +0000 (20:55 -0800)]
t0000: catch trivial pilot errors.
People seem to be getting test failure from t6021 not becuase
git is faulty but because they forgot to install "merge". Check
this and other trivial pilot errors in the first test.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 11 Dec 2005 02:36:15 +0000 (18:36 -0800)]
t3300: funny name test
Add double quote character to the test pattern.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Daniel Barkalow [Sat, 10 Dec 2005 22:25:24 +0000 (17:25 -0500)]
Allow saving an object from a pipe
In order to support getting data into git with scripts, this adds a
--stdin option to git-hash-object, which will make it read from stdin.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong [Thu, 24 Nov 2005 07:58:16 +0000 (23:58 -0800)]
archimport: fix a in new changeset applyer addition
Fix a stupid bug I introduced when splitting the
accurate and fast changeset appliers.
Also, remove an old debugging statement I added
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Eric Wong [Thu, 24 Nov 2005 07:56:31 +0000 (23:56 -0800)]
archimport: Fix a bug I introduced in the new log parser
This fixes the case (that worked originally in Martin's version)
where the only new/modified files are Arch control files.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Eric Wong [Thu, 24 Nov 2005 07:55:04 +0000 (23:55 -0800)]
archimport: Add the accurate changeset applyer
And make it the default.
This includes stats tracking to verbose mode
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Eric Wong [Thu, 24 Nov 2005 07:53:55 +0000 (23:53 -0800)]
archimport: safer log file parsing
Better logfile parsing, no longer confused by 'headers' after the first
blank line.
Re-enabled tag-reading with abrowse (baz and tla compatible)
Remove need to quote args to external processes
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Eric Wong [Thu, 24 Nov 2005 07:52:43 +0000 (23:52 -0800)]
archimport: add -D <depth> and -a switch
add -D <depth> option to abrowse add -a switch to attempt to
auto-register archives at mirrors.sourcecontrol.net
(ML: Also removes some std libraries no longer in use)
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Eric Wong [Thu, 24 Nov 2005 07:51:33 +0000 (23:51 -0800)]
archimport: remove git wrapper dependency
use git-diff-files instead of git diff-files so we don't rely on the
wrapper being installed (some people may have git as GNU interactive
tools :)
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Eric Wong [Thu, 24 Nov 2005 07:50:27 +0000 (23:50 -0800)]
archimport: fix -t tmpdir switch
set TMPDIR env correctly if -t <tmpdir> is passed from the command-line.
setting TMPDIR => 1 as an argument to tempdir() has no effect otherwise
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Eric Wong [Thu, 24 Nov 2005 07:48:57 +0000 (23:48 -0800)]
archimport: remove String::ShellQuote dependency.
use safe_pipe_capture() or system() over backticks where
shellquoting may have been necessary.
More changes planned, so I'm not touching the parts I'm
planning on replacing entirely.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Eric Wong [Thu, 24 Nov 2005 07:47:39 +0000 (23:47 -0800)]
archimport: first, make sure it still compiles
(ML: And introduce safe_pipe_capture())
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Junio C Hamano [Sat, 10 Dec 2005 07:41:03 +0000 (23:41 -0800)]
Link Everyday GIT to main documentation tree.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 10 Dec 2005 07:07:29 +0000 (23:07 -0800)]
Everyday GIT with 20 commands
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sat, 10 Dec 2005 01:32:18 +0000 (17:32 -0800)]
Use GIT_EXEC_PATH explicitly for initial git-init-db in tests.
This is just a belts-and-suspenders check, but makes sure we
have both "git" and "git-init-db" built, executable, and
checking.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Alex Riesen [Thu, 8 Dec 2005 20:25:55 +0000 (21:25 +0100)]
use "git init-db" in tests
This is to catch an error where tests are run without first
building what are being tested. Relying on prefixing $PATH with
the build directory and expect that the PATH mechanism would
find what we just built would silently run an already installed
binaries from the PATH.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 9 Dec 2005 07:18:41 +0000 (23:18 -0800)]
git-prune: never lose objects reachable from our refs.
Explicit <head> arguments to git-prune replaces, instead of
extends, the list of heads used for reachability analysis by
fsck-objects. By giving a subset of heads by mistake, objects
reachable only from other heads can be removed, resulting in a
corrupted repository.
This commit stops replacing the list of heads, and makes the
command line arguments to add to them instead for safety.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 9 Dec 2005 01:29:11 +0000 (17:29 -0800)]
qsort(): ptrdiff_t may be larger than int
This is a companion patch to
e23eff8be92a2a2cb66b53deef020063cff285ed
commit. The same logic, the same rationale that a comparison
function that returns an int should not just compute a ptrdiff_t
and return it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 9 Dec 2005 00:30:24 +0000 (16:30 -0800)]
Documentation: git-prune
Not replacing but always including our own refs may be more
desirable (and unarguably much safer), but at the same time I
have a suspicion that that might be forbidding a useful usage I
haven't thought of, so...
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull [Thu, 8 Dec 2005 23:28:06 +0000 (00:28 +0100)]
Documentation/git-read-tree.txt: Add --reset to SYNOPSIS.
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull [Thu, 8 Dec 2005 23:28:05 +0000 (00:28 +0100)]
Documentation/git-tag.txt: Fix the order of sections (DESCRIPTION should come before OPTIONS).
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull [Thu, 8 Dec 2005 23:28:05 +0000 (00:28 +0100)]
Documentation/git-update-server-info.txt: Add -f alias for --force to documentation.
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull [Thu, 8 Dec 2005 23:28:05 +0000 (00:28 +0100)]
Documentation/git-http-fetch.txt: Document the commit-id argument.
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull [Thu, 8 Dec 2005 23:28:05 +0000 (00:28 +0100)]
Documentation/git-repack.txt: Add -l and -n.
This adds documentation for the -l and -n options to git-repack.
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull [Thu, 8 Dec 2005 23:28:05 +0000 (00:28 +0100)]
Documentation/git-ls-remote.txt: Add -h and -t.
-h and -t are aliases for --heads and --tags to git-ls-remote.
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull [Thu, 8 Dec 2005 23:28:05 +0000 (00:28 +0100)]
Documentation/git-format-patch.txt: Add --signoff, --check, and long option-names.
The documentation was lacking descriptions for the --signoff and --check
options to git-format-patch. It was also missing the following long
option-names: --output-directory (-o), --numbered (-n), --keep-subject
(-k), --author (-a), --date (-d), and --mbox (-m).
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull [Thu, 8 Dec 2005 23:28:05 +0000 (00:28 +0100)]
Add documentation for the --topo-order option to git-show-branch.
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull [Thu, 8 Dec 2005 23:28:05 +0000 (00:28 +0100)]
Add documentation for git-revert and git-cherry-pick.
* Added the -e option to the documentation of git-cherry-pick.
* Added the -e and --no-commit option to git-revert.
* Removed redundant case expression for -n as --no-edit (already taken by
--no-commit).
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull [Thu, 8 Dec 2005 23:28:05 +0000 (00:28 +0100)]
Documentation/git-cherry-pick: Add --replay and --no-commit.
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull [Thu, 8 Dec 2005 23:28:05 +0000 (00:28 +0100)]
Documentation/git-cvsimport.txt: Fix a slight glitch in description heading.
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull [Thu, 8 Dec 2005 23:28:05 +0000 (00:28 +0100)]
Documentation/git-verify-pack.txt: added documentation for --.
The -- option has been added to the documentation of git-verify-pack.
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull [Thu, 8 Dec 2005 23:28:05 +0000 (00:28 +0100)]
Documentation/git-commit.txt: Add long options and -- to documentation.
Added the following long options to documentation:
* --all
* --signoff
* --verify
* --no-verify
* --edit
Also added documentation for the -- option for terminating option parsing.
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull [Thu, 8 Dec 2005 23:28:05 +0000 (00:28 +0100)]
Use uniform description for the '--' option.
All descriptions of the '--' option were the same except for that in
Documentation/git-merge-index.txt.
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull [Thu, 8 Dec 2005 23:28:05 +0000 (00:28 +0100)]
Fix the description of --utf8 and --keep to git-am.
The git-am script actually transform --utf8 and --keep to -u and -k when
sent to git-mailinfo.
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Nikolai Weibull [Thu, 8 Dec 2005 23:28:05 +0000 (00:28 +0100)]
Document the --non-empty command-line option to git-pack-objects.
This provides (minimal) documentation for the --non-empty command-line
option to the pack-objects command.
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 8 Dec 2005 22:10:02 +0000 (14:10 -0800)]
show-branch: comment typo
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 8 Dec 2005 22:04:33 +0000 (14:04 -0800)]
Documentation: recursive is the default strategy these days.
We still said resolve was the default in handful places.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 8 Dec 2005 05:52:28 +0000 (21:52 -0800)]
Make sure we use compat/subprocess.py with Python 2.3 while running tests.
Otherwise the test will not succeed without installing.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Daniel Barkalow [Thu, 8 Dec 2005 02:04:38 +0000 (21:04 -0500)]
Clean up file descriptors when calling hooks.
When calling post-update hook, don't leave stdin and stdout connected to
the pushing connection.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 8 Dec 2005 01:48:53 +0000 (17:48 -0800)]
refs.c: make sure leading directories exist before writing a ref.
Otherwise cloning a repository with hierarchical branch/tag
over http would fail.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 8 Dec 2005 00:44:12 +0000 (16:44 -0800)]
Documentation(tutorial): adjust merge example to the new merge world order.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 8 Dec 2005 00:26:49 +0000 (16:26 -0800)]
Documentation(cvs-migration): minor cleanups.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 8 Dec 2005 00:16:04 +0000 (16:16 -0800)]
Documentation(glossary): minor formatting clean-ups.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Thu, 8 Dec 2005 00:05:21 +0000 (16:05 -0800)]
Documentation: git.html/git.7
Finish each sentence with a full stop.
Instead of saying 'directory index' 'directory cache' etc,
consistently say 'index'.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 7 Dec 2005 19:25:42 +0000 (11:25 -0800)]
Merge http://www.kernel.org/pub/scm/gitk/gitk
Paul Mackerras [Wed, 7 Dec 2005 12:28:22 +0000 (23:28 +1100)]
gitk: Work around Tcl's non-standard names for encodings
This uses a table of encoding names and aliases distilled from
http://www.iana.org/assignments/character-sets plus some heuristics
to convert standard encoding names to ones that Tcl recognizes.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Junio C Hamano [Wed, 7 Dec 2005 09:45:38 +0000 (01:45 -0800)]
update-index: allow --index-info to add higher stages.
The new merge world order tells the merge strategies to leave
the cache unmerged and store the automerge result in the working
tree if automerge is not clean. This was done for the resolve
strategy and recursive strategy when no rename is involved, but
recording a conflicting merge in the rename case could not
easily be done by the recursive strategy.
This commit adds a new input format, in addition to the exsting
two, to "update-index --index-info".
(1) mode SP sha1 TAB path
The first format is what "git-apply --index-info"
reports, and used to reconstruct a partial tree
that is used for phony merge base tree when falling
back on 3-way merge.
(2) mode SP type SP sha1 TAB path
The second format is to stuff git-ls-tree output
into the index file.
(3) mode SP sha1 SP stage TAB path
This format is to put higher order stages into the
index file and matches git-ls-files --stage output.
To place a higher stage entry to the index, the path should
first be removed by feeding a mode=0 entry for the path, and
then feeding necessary input lines in the (3) format.
For example, starting with this index:
$ git ls-files -s
100644
8a1218a1024a212bb3db30becd860315f9f3ac52 0 frotz
$ git update-index --index-info ;# interactive session -- input follows...
0
0000000000000000000000000000000000000000 frotz
100644
8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz
100755
8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz
The first line of the input feeds 0 as the mode to remove the
path; the SHA1 does not matter as long as it is well formatted.
Then the second and third line feeds stage 1 and stage 2 entries
for that path. After the above, we would end up with this:
$ git ls-files -s
100644
8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz
100755
8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz
This completes the groundwork for the new merge world order.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 7 Dec 2005 08:50:33 +0000 (00:50 -0800)]
git-merge-one: new merge world order.
This does two things:
- Use new --stage=2 option to create the working tree file with
leading paths and correct permission bits using
checkout-index, as before.
- Make sure we do not confuse "merge" program when the file
being merged has an unfortunate name, '-L'.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Wed, 7 Dec 2005 08:29:51 +0000 (00:29 -0800)]
checkout-index: allow checking out from higher stages.
The new option, --stage=<n>, lets you copy out from an unmerged,
higher stage. This is to help the new merge world order during
a nontrivial merge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jason Riedy [Tue, 6 Dec 2005 22:21:52 +0000 (14:21 -0800)]
Use printf rather than echo -n.
On AIX, there is no -n option to the system's echo. Instead,
it needs the '\c' control character. We could replace
echo -n "foo"
with
echo -e "foo\c"
but printf is recommended by most man pages. Tested on AIX
5.3, Solaris 8, and Debian.
[jc: futureproofed two instances that uses variable with '%s'
so later feeding different messages would not break things too
easily; others are emitting literal so whoever changes the
literal ought to notice more easily so they are safe.]
Signed-off-by: E. Jason Riedy <ejr@cs.berkeley.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Dec 2005 21:41:48 +0000 (13:41 -0800)]
qsort() ptrdiff_t may be larger than int
Morten Welinder <mwelinder@gmail.com> writes:
> The code looks wrong. It assumes that pointers are no larger than ints.
> If pointers are larger than ints, the code does not necessarily compute
> a consistent ordering and qsort is allowed to do whatever it wants.
>
> Morten
>
> static int compare_object_pointers(const void *a, const void *b)
> {
> const struct object * const *pa = a;
> const struct object * const *pb = b;
> return *pa - *pb;
> }
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jason Riedy [Tue, 6 Dec 2005 22:20:16 +0000 (14:20 -0800)]
[PATCH] Initial AIX portability fixes.
Added an AIX clause in the Makefile; that clause likely
will be wrong for any AIX pre-5.2, but I can only test
on 5.3. mailinfo.c was missing the compat header file,
and convert-objects.c needs to define a specific
_XOPEN_SOURCE as well as _XOPEN_SOURCE_EXTENDED.
Signed-off-by: E. Jason Riedy <ejr@cs.berkeley.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Dec 2005 08:07:58 +0000 (00:07 -0800)]
git-merge-one-file: resurrect leading path creation.
Since we do not use git-update-index followed by
git-checkout-index -u to create the half-merged file on
conflicting case anymore, we need to make sure the leading
directories are created here.
Maybe a better solution would be to allow update-index to add to
higher stage, and checkout-index to extract from such, but that
is a change slightly bigger than I would like to have so close
to 1.0, so this should do for now.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Dec 2005 07:26:10 +0000 (23:26 -0800)]
Documentaiton (read-tree): update description of 3-way
The merge-one-file used to leave the working tree intact, but
it has long been changed to leave the merge result there since
2a68a8659f7dc55fd285d235ae2d19e7a8116c30 commit.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Dec 2005 06:36:22 +0000 (22:36 -0800)]
Documentation: hash-object.
The file parameter is better spelled just "file", not "any file
on the filesystem". We stress that in the description text
later anyway.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Dec 2005 06:30:07 +0000 (22:30 -0800)]
write-tree: check extra arguments and die but be a bit more helpful.
"git-write-tree junk" complains and dies, but it does not say
what option it supports. Die with the usage string in such a
case.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Dec 2005 06:29:36 +0000 (22:29 -0800)]
init-db: check extra arguments and complain.
"git-init-db junk" does not complain but just ignores "junk".
Die with the usage string in such a case.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Dec 2005 06:29:05 +0000 (22:29 -0800)]
hash-object: -- and --help
It was cumbersome to feed hash-object the file '-t' (you could
have said "./-t", though). Teach it '--' that terminates the
option list, like everybody else. There is no way to extract
usage string from the command either, so teach it "--help" as
well.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Jon Loeliger [Tue, 6 Dec 2005 05:13:03 +0000 (23:13 -0600)]
Added documentation for few missing options.
More $ shell prompts in examples.
Minor English grammar improvements.
Added a few "See Also"s.
Use back-ticks on more command examples.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Dec 2005 02:14:34 +0000 (18:14 -0800)]
git-mv to work with Perl 5.6
List form of pipe open is 5.8 invention.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Tue, 6 Dec 2005 02:13:31 +0000 (18:13 -0800)]
Fix 5501 test
Not everybody can rely on /bin/sh to be sane, and we support
SHELL_PATH for that. Use it.
mktemp(1) is not used anywhere else in the core git. Do not
introduce dependency on it.
Not everybody's "which" gives a sane return value. For example,
on Solaris 'which XXX' says "no XXX in /usr/bin /bin ..." and
exits with zero status. The lesson here is to never use 'which'
in your scripts.
Signed-off-by: Junio C Hamano <junkio@twinsun.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 19:54:29 +0000 (11:54 -0800)]
Clean up compatibility definitions.
This attempts to clean up the way various compatibility
functions are defined and used.
- A new header file, git-compat-util.h, is introduced. This
looks at various NO_XXX and does necessary function name
replacements, equivalent of -Dstrcasestr=gitstrcasestr in the
Makefile.
- Those function name replacements are removed from the Makefile.
- Common features such as usage(), die(), xmalloc() are moved
from cache.h to git-compat-util.h; cache.h includes
git-compat-util.h itself.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Paul Mackerras [Mon, 5 Dec 2005 22:46:23 +0000 (09:46 +1100)]
gitk: Some improvements for the code for updating the display
This should be more robust in the case that some does "Update" before
the initial drawing is finished. It also avoids having to reset the
list of children for each commit and reconstruct it.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Jason Riedy [Mon, 5 Dec 2005 18:38:30 +0000 (10:38 -0800)]
[PATCH] Document config.mak in INSTALL.
The existing config.mak should satisfy almost everyone... You
can change the prefix and other vars catch the new setting
anyways. I had forgotten that ?= acts as = (lazy value binding)
and as not := (immediate value binding).
Signed-off-by: E. Jason Riedy <ejr@cs.berkeley.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Fri, 25 Nov 2005 22:22:27 +0000 (14:22 -0800)]
config.c: remove unnecessary header in minimum configuration file.
It is just silly to start the file called "config" with a
comment that says "This is the config file."
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 19:12:01 +0000 (11:12 -0800)]
server-info.c: and two functions are not used anymore.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 18:39:17 +0000 (10:39 -0800)]
server-info.c: use pack_local like everybody else.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 08:57:48 +0000 (00:57 -0800)]
Documentation: shared repository management in tutorial.
The branch policy script I outlined was improved and polished by
Carl and posted on the list twice since then. It is a shame not
to pick it up, so replace the original outline in
howto/update-hook-example.txt with the latest from Carl.
Also talk about setting up git-shell to allow git-push/git-fetch
only SSH access to a shared repository host in the tutorial.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 08:32:01 +0000 (00:32 -0800)]
Documentation: push/receive hook references.
Mention documentation pages that talk about update and
post-update hooks from git-push, because a frequently asked
question is "I want X to happen when I push" and people would
not know to look at git-receive-pack documentation until they
understand that is what runs on the other end.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 08:22:01 +0000 (00:22 -0800)]
Documentation: git-diff asciidoc table workaround.
The table facility was nice in rendering HTML but was disastrous
for man page. Reword the text and do not use table for now.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 08:15:44 +0000 (00:15 -0800)]
Documentation: git-mv manpage workaround.
Work-around asciidoc manpage trouble that does not seem to allow
more than one line in the SYNOPSIS section.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 08:15:24 +0000 (00:15 -0800)]
Documentation: talk about pathspec in bisect.
Also work-around asciidoc manpage trouble that does not seem to
allow more than one line in the SYNOPSIS section.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 07:12:36 +0000 (23:12 -0800)]
server-info: throw away T computation as well.
Again, dumb transport clients are too dumb to make use of the
top objects information to make a choice among multiple packs,
so computing these lines are useless for now. We could
resurrect them if needed later. Also dumb transport clients
presumably can do their own approximation by downloading idx
files to see how relevant each pack is for their fetch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 07:02:54 +0000 (23:02 -0800)]
server-info: stop sorting packs by latest date.
This does not seem to buy us much, for the same reason as the
previous change. Dumb clients are still too dumb.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 06:52:19 +0000 (22:52 -0800)]
server-info.c: drop unused D lines.
We tried to compute pack interdependency information in
$GIT_DIR/objects/info/packs, hoping that dumb transports would
make use of it when choosing from multiple choice, but that has
never materialized, so stop computing D lines for now.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 06:48:43 +0000 (22:48 -0800)]
sha1_file.c: make sure packs in an alternate odb is named properly.
We somehow ended up registering packs in alternate object
directories as "dir/object//pack/pack-*", which confusd the
update-server-info code very badly. Also we did not attempt to
detect a mistake of listing the object directory itself as one
of the alternates. This does not lead to incorrect behaviour,
but is simply wasteful, so try to do so when we are trivially
able to.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 05:24:22 +0000 (21:24 -0800)]
git.c: remove excess output for debugging when command is too long.
When the given command name was too long, we exited with a
message with the number of bytes of the final command name
inside parentheses, without saying what that number is. It was
only meant as a debugging aid while development, so remove it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 05:13:57 +0000 (21:13 -0800)]
struct tree: remove unused field "parent"
The field is not used anymore, after the recent ls-tree rewrite.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Mon, 5 Dec 2005 00:38:40 +0000 (16:38 -0800)]
Documentation: rebase does not use cherry-pick anymore.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Petr Baudis [Sat, 26 Nov 2005 22:12:44 +0000 (23:12 +0100)]
Document the --(no-)edit switch of git-revert and git-cherry-pick
This switch was not documented properly. I decided not to mention
the --no-edit switch in the git-cherry-pick documentation since
we always default to no editing.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 4 Dec 2005 23:58:50 +0000 (15:58 -0800)]
show-branch: allow glob pattern to name branches to show.
With this, you can say "git-show-branch topic/* master" to show
all the topic branches you have under .git/refs/heads/topic/ and
your master branch. Another example is "git-show-branch --list
v1.0*" to show all the v1.0 tags. You can disambiguate by
saying "heads/topic/*" to show only topic branches if you have
tags under .git/refs/tags/topic/ as well.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Petr Baudis [Sun, 4 Dec 2005 23:31:08 +0000 (00:31 +0100)]
Update the git-ls-tree documentation
This patch aims to freshen up a bit the git-ls-tree documentation. It hints
that the list of paths are in fact patterns to be matched, explains the new
-t, --name-only and --name-status options, corrects the original autorship
information to refer to yours sincerely, corrects several grammar mistakes,
etc.
Since the documentation still deserves some significant work (at least
proper description of the pattern matching), I also added the stub notice.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano [Sun, 4 Dec 2005 22:59:58 +0000 (14:59 -0800)]
git.c: two fixes, gitsetenv type and off-by-one error.
gitsetenv as implemented in compat/setenv.c takes two const char*
and int; match that.
Also fix an incorrect attempt in prepend_to_path() to
NUL-terminate the string which stuffed the NUL character at one
past the end of allocation, and was not needed to begin with (we
copy the old_path string including the NUL which terminates it).
Signed-off-by: Junio C Hamano <junkio@cox.net>