git.git
18 years agot5500-fetch-pack: remove local (bashism) usage.
Eric Wong [Fri, 26 May 2006 02:06:17 +0000 (19:06 -0700)]
t5500-fetch-pack: remove local (bashism) usage.

None of the variables seem to conflict, so local was unnecessary.

Also replaced ${var:pos:len} with the sed equivalent.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotests: Remove heredoc usage inside quotes
Eric Wong [Fri, 26 May 2006 02:06:16 +0000 (19:06 -0700)]
tests: Remove heredoc usage inside quotes

The use of heredoc inside quoted strings doesn't seem to be
supported by dash.  pdksh seems to handle it fine, however.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agot3300-funny-names: shell portability fixes
Eric Wong [Fri, 26 May 2006 02:06:15 +0000 (19:06 -0700)]
t3300-funny-names: shell portability fixes

echo isn't remotely standardized for handling backslashes,
so cat + heredoc seems better

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-format-patch --start-number <n>
Johannes Schindelin [Thu, 25 May 2006 21:55:11 +0000 (23:55 +0200)]
git-format-patch --start-number <n>

Since the "a..b c..d" syntax is interpreted as "b ^a d ^c" as other
range-ish commands, if you want to format a..b and then c..d and end
up with files consecutively numbered, the second run needs to be able
to tell the command what number to start from.

This does not imply --numbered (which gives [PATCH n/m] to the subject).

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDon't write directly to a make target ($@).
Jim Meyering [Thu, 25 May 2006 16:52:01 +0000 (18:52 +0200)]
Don't write directly to a make target ($@).

Otherwise, if make is suspended, or killed with prejudice, or if the
system crashes, you could be left with an up-to-date, yet corrupt,
generated file.

I left off the `clean' addition, because I believe "make clean" should
not remove wildcard patterns like "*+", on the off-chance that someone
uses names like that for files they care about.  Besides, in practice,
those temporary files are left behind so rarely that they're not a bother,
and they're removed again as part of the next build.

[jc: sign-off?]

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobogus "fatal: Not a git repository"
Linus Torvalds [Thu, 25 May 2006 15:22:42 +0000 (08:22 -0700)]
bogus "fatal: Not a git repository"

I was just testing that "git ls-remote" change by Junio, and when you're
not in a git repository, it gives this totally bogus warning. The _target_
obviously has to be a git repository, but there's no reason why you'd have
to be in a local git repo when doing an ls-remote.

The reason is commit 73136b2e8a8ee024320c5ac6a0f14f912432bf03 by Dscho: it
adds calls to git-repo-config in git-parse-remote.sh to get the remote
shorthands etc.

Now, either we should just hide and ignore the error from git-repo-config
(probably bad, because some errors _are_ valid - like git-repo-config
failing due to bad syntax in the config file), or we should just make
git-repo-config quietly handle the case of not being in a git repository.

This does the latter: just quietly accepting (and doing nothing - trying
to set a value will result in the lock-file failing) our lot in life
sounds better than dying with a bogus error message.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Acked-By: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocumentation/Makefile: remove extra /
Martin Waitz [Thu, 25 May 2006 12:37:46 +0000 (14:37 +0200)]
Documentation/Makefile: remove extra /

As both DESTDIR and the prefix are supposed to be absolute pathnames
they can simply be concatenated without an extra / (like in the main Makefile).
The extra slash may even break installation on Windows.

[jc: adjusted an earlier workaround for this problem in the dist-doc
 target in the main Makefile as well. ]

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitk: Move "pickaxe" find function to highlight facility
Paul Mackerras [Fri, 26 May 2006 00:43:47 +0000 (10:43 +1000)]
gitk: Move "pickaxe" find function to highlight facility

This removes the "Files" and "Pickaxe" parts of the "Find" function,
so Find is now just about searching the commit data.  We now highlight
the commits that match the Find string (without having to press Find),
and have a drop-down menu for selecting whether the git-diff-tree based
highlighting is done on paths or on adding/removing a given string.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agogitk: Improve the text window search function
Paul Mackerras [Thu, 25 May 2006 11:25:13 +0000 (21:25 +1000)]
gitk: Improve the text window search function

This makes it work a bit more smoothly, and adds a reverse-search
function, for which I stole the ^R binding from the find function.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agocvsimport: avoid "use" with :tag
Jeff King [Wed, 24 May 2006 13:58:28 +0000 (09:58 -0400)]
cvsimport: avoid "use" with :tag

Avoid "use POSIX qw(strftime dup2 :errno_h)"; it was reported
that a Perl installations on Mandrake 9.1 did not like it, even
though it understood "use POSIX qw(:errno_h)".  Funny.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofetch-pack: give up after getting too many "ack continue"
Junio C Hamano [Thu, 25 May 2006 04:48:34 +0000 (21:48 -0700)]
fetch-pack: give up after getting too many "ack continue"

If your repository have more roots than the remote repository
you ask an object for, the remote upload-pack keeps responding
"ack continue" until it fills up its received-have buffer
(currently 256 entries).  Usually this is not a problem because
the requester stops traversing the ancestry chain from the commit
it gets "ack continue" for, but this mechanism does not work as
a roadblock when it traverses down the path to the root the
other side does not have.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocat-file: document -p option
Jeff King [Thu, 25 May 2006 01:22:32 +0000 (21:22 -0400)]
cat-file: document -p option

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoTest that git-branch -l works.
Shawn Pearce [Thu, 25 May 2006 03:34:04 +0000 (23:34 -0400)]
Test that git-branch -l works.

If the user supplies -l to git-branch when creating a new branch
then the new branch's log should be created automatically and the
branch creation should be logged in that log.

Further if a branch is being deleted and it had a log then also
verify that the log was deleted.

Test git-checkout -b foo -l for creating a new branch foo with a
log and checking out that branch.

Fixed git-checkout -b foo -l as the branch variable name was
incorrect in the script.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoVerify git-commit provides a reflog message.
Shawn Pearce [Thu, 25 May 2006 03:33:18 +0000 (23:33 -0400)]
Verify git-commit provides a reflog message.

The reflog message from git-commit should include the first line
of the commit message as supplied by the user.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoBuilt git-upload-tar should be ignored.
Shawn Pearce [Thu, 25 May 2006 02:48:39 +0000 (22:48 -0400)]
Built git-upload-tar should be ignored.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agols-remote: fix rsync:// to report HEAD
Junio C Hamano [Thu, 25 May 2006 04:36:14 +0000 (21:36 -0700)]
ls-remote: fix rsync:// to report HEAD

This prevented recent git-clone from checking out the working
tree files in the cloned repository.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'master' into sp/reflog
Junio C Hamano [Wed, 24 May 2006 23:49:24 +0000 (16:49 -0700)]
Merge branch 'master' into sp/reflog

* master: (90 commits)
  fetch.c: remove an unused variable and dead code.
  Clean up sha1 file writing
  Builtin git-cat-file
  builtin format-patch: squelch content-type for 7-bit ASCII
  CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields.
  add more informative error messages to git-mktag
  remove the artificial restriction tagsize < 8kb
  git-rebase: use canonical A..B syntax to format-patch
  git-format-patch: now built-in.
  fmt-patch: Support --attach
  fmt-patch: understand old <his> notation
  Teach fmt-patch about --keep-subject
  Teach fmt-patch about --numbered
  fmt-patch: implement -o <dir>
  fmt-patch: output file names to stdout
  Teach fmt-patch to write individual files.
  built-in tar-tree and remote tar-tree
  Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree.
  Builtin git-show-branch.
  Builtin git-apply.
  ...

18 years agofetch.c: remove an unused variable and dead code.
Junio C Hamano [Wed, 24 May 2006 23:42:38 +0000 (16:42 -0700)]
fetch.c: remove an unused variable and dead code.

Funnily enough, this variable was never assigned ever since it
was introduced, and has been protecting some code that has never
been executed.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'master' into lt/apply
Junio C Hamano [Wed, 24 May 2006 21:08:30 +0000 (14:08 -0700)]
Merge branch 'master' into lt/apply

* master: (40 commits)
  Clean up sha1 file writing
  Builtin git-cat-file
  builtin format-patch: squelch content-type for 7-bit ASCII
  CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields.
  add more informative error messages to git-mktag
  remove the artificial restriction tagsize < 8kb
  git-rebase: use canonical A..B syntax to format-patch
  git-format-patch: now built-in.
  fmt-patch: Support --attach
  fmt-patch: understand old <his> notation
  Teach fmt-patch about --keep-subject
  Teach fmt-patch about --numbered
  fmt-patch: implement -o <dir>
  fmt-patch: output file names to stdout
  Teach fmt-patch to write individual files.
  Use RFC2822 dates from "git fmt-patch".
  git-fmt-patch: thinkofix to show [PATCH] properly.
  rename internal format-patch wip
  Minor tweak on subject line in --pretty=email
  Tentative built-in format-patch.
  ...

18 years agoClean up sha1 file writing
Linus Torvalds [Wed, 24 May 2006 15:30:54 +0000 (08:30 -0700)]
Clean up sha1 file writing

This cleans up and future-proofs the sha1 file writing in sha1_file.c.

In particular, instead of doing a simple "write()" call and just verifying
that it succeeds (or - as in one place - just assuming it does), it uses
"write_buffer()" to write data to the file descriptor while correctly
checking for partial writes, EINTR etc.

It also splits up write_sha1_to_fd() to be a lot more readable: if we need
to re-create the compressed object, we do so in a separate helper
function, making the logic a whole lot more modular and obvious.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoBuiltin git-cat-file
Timo Hirvonen [Wed, 24 May 2006 11:08:46 +0000 (14:08 +0300)]
Builtin git-cat-file

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoapply: force matching at the beginning.
Junio C Hamano [Wed, 24 May 2006 20:19:50 +0000 (13:19 -0700)]
apply: force matching at the beginning.

When there is no leading context, the patch must match at the
beginning of preimage; otherwise there is a "patch adds these
lines while the other lines were added to the original file"
conflict.

This is the opposite of match_end fix earlier in this series.
Unlike matching at the end case, we can additionally check the
preimage line number recorded in the patch, so the change is not
symmetrical with the earlier one.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/fmt-patch'
Junio C Hamano [Wed, 24 May 2006 19:21:17 +0000 (12:21 -0700)]
Merge branch 'jc/fmt-patch'

* jc/fmt-patch:
  builtin format-patch: squelch content-type for 7-bit ASCII
  CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields.

18 years agoMerge branch 'be/tag'
Junio C Hamano [Wed, 24 May 2006 19:20:48 +0000 (12:20 -0700)]
Merge branch 'be/tag'

* be/tag:
  add more informative error messages to git-mktag
  remove the artificial restriction tagsize < 8kb

18 years agoMerge branch 'js/fmt-patch'
Junio C Hamano [Wed, 24 May 2006 19:19:47 +0000 (12:19 -0700)]
Merge branch 'js/fmt-patch'

This makes "git format-patch" a built-in.

* js/fmt-patch:
  git-rebase: use canonical A..B syntax to format-patch
  git-format-patch: now built-in.
  fmt-patch: Support --attach
  fmt-patch: understand old <his> notation
  Teach fmt-patch about --keep-subject
  Teach fmt-patch about --numbered
  fmt-patch: implement -o <dir>
  fmt-patch: output file names to stdout
  Teach fmt-patch to write individual files.
  Use RFC2822 dates from "git fmt-patch".
  git-fmt-patch: thinkofix to show [PATCH] properly.
  rename internal format-patch wip
  Minor tweak on subject line in --pretty=email
  Tentative built-in format-patch.

18 years agoMerge branch 'jc/builtin-n-tar-tree'
Junio C Hamano [Wed, 24 May 2006 18:24:50 +0000 (11:24 -0700)]
Merge branch 'jc/builtin-n-tar-tree'

This pulls in "make many commands built-in" branches.

* jc/builtin-n-tar-tree:
  built-in tar-tree and remote tar-tree
  Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree.
  Builtin git-show-branch.
  Builtin git-apply.
  Builtin git-commit-tree.
  Builtin git-read-tree.
  Builtin git-tar-tree.
  Builtin git-ls-tree.
  Builtin git-ls-files.

18 years agoMerge branch 'jc/fetch-sorted'
Junio C Hamano [Wed, 24 May 2006 18:04:55 +0000 (11:04 -0700)]
Merge branch 'jc/fetch-sorted'

* jc/fetch-sorted:
  fetch-pack: output refs in the order they were given on the command line.

18 years agoMerge branch 'lt/dirwalk'
Junio C Hamano [Wed, 24 May 2006 18:04:16 +0000 (11:04 -0700)]
Merge branch 'lt/dirwalk'

This makes 'git add' and 'git rm' built-ins.

* lt/dirwalk:
  Add builtin "git rm" command
  Move pathspec matching from builtin-add.c into dir.c
  Prevent bogus paths from being added to the index.
  builtin-add: fix unmatched pathspec warnings.
  Remove old "git-add.sh" remnants
  builtin-add: warn on unmatched pathspecs
  Do "git add" as a builtin
  Clean up git-ls-file directory walking library interface
  libify git-ls-files directory traversal

18 years agoAdd a test-case for git-apply trying to add an ending line
Catalin Marinas [Tue, 23 May 2006 21:48:36 +0000 (22:48 +0100)]
Add a test-case for git-apply trying to add an ending line

git-apply adding an ending line doesn't seem to fail if the ending line is
already present in the patched file.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years ago--summary output should print immediately after stats.
Sean [Tue, 23 May 2006 09:34:23 +0000 (05:34 -0400)]
--summary output should print immediately after stats.

Currently the summary is displayed after the patch.  Fix this so
that the output order is stat-summary-patch.  As a consequence of
the way this is coded, the --summary option will only actually
display summary data if combined with either the --stat or
--patch-with-stat option.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoapply: treat EOF as proper context.
Linus Torvalds [Wed, 24 May 2006 02:08:01 +0000 (19:08 -0700)]
apply: treat EOF as proper context.

Catalin noticed that we do not treat end-of-file condition shown
in the patch text as the patch context.  This causes a patch
that appends at the end of the file to cleanly apply even if
something else has been appended to the file.  If this happened
in the middle, we would refuse by saying that the file has
conflicting modifications.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: ignore expansion of svn:keywords
Eric Wong [Wed, 24 May 2006 02:23:41 +0000 (19:23 -0700)]
git-svn: ignore expansion of svn:keywords

Unlike my earlier test patch, this also checks svn:eol-style and
makes sure it's applied to working copy updates.  This is
definitely more correct than my original attempt at killing
keyword expansions, but I still haven't tested it enough to
know.  Feedback would be much appreciated.

Also changed assert_svn_wc_clean() to only work on the svn
working copy.  This requires a separate call to assert_tree() to
check wc integrity against git in preparation for another change
I'm planning.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-svn: starting a 1.1.0-pre development version
Eric Wong [Wed, 24 May 2006 02:23:40 +0000 (19:23 -0700)]
git-svn: starting a 1.1.0-pre development version

Some not-very-well-tested changes coming...

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitk: First cut at a search function in the patch/file display window
Paul Mackerras [Wed, 24 May 2006 00:16:03 +0000 (10:16 +1000)]
gitk: First cut at a search function in the patch/file display window

This does incremental highlighting of matches to the search string
but doesn't do true incremental search a la emacs.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agocvsimport: set up commit environment in perl instead of using env
Jeff King [Tue, 23 May 2006 20:59:44 +0000 (16:59 -0400)]
cvsimport: set up commit environment in perl instead of using env

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsimport: do not barf on creation of an empty file.
Junio C Hamano [Tue, 23 May 2006 23:30:39 +0000 (16:30 -0700)]
cvsimport: do not barf on creation of an empty file.

When the server says "created this file whose length is empty",
we mistakenly said "oops, the server did not say a sensible
thing".  Fix it.

Spotted and fixed by Linus, acked by Martin.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'jc/tartree' into jc/builtin-n-tar-tree
Junio C Hamano [Tue, 23 May 2006 21:44:31 +0000 (14:44 -0700)]
Merge branch 'jc/tartree' into jc/builtin-n-tar-tree

* jc/tartree:
  built-in tar-tree and remote tar-tree

18 years agoAllow in body headers beyond the in body header prefix.
Eric W. Biederman [Tue, 23 May 2006 19:58:36 +0000 (13:58 -0600)]
Allow in body headers beyond the in body header prefix.

- handle_from is fixed to not mangle it's input line.

- Then handle_inbody_header is allowed to look in
  the body of a commit message for additional headers
  that we haven't already seen.

This allows patches with all of the right information in
unfortunate places to be imported.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMore accurately detect header lines in read_one_header_line
Eric W. Biederman [Tue, 23 May 2006 19:53:20 +0000 (13:53 -0600)]
More accurately detect header lines in read_one_header_line

Only count lines of the form '^.*: ' and '^From ' as email
header lines.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoIn handle_body only read a line if we don't already have one.
Eric W. Biederman [Tue, 23 May 2006 19:49:00 +0000 (13:49 -0600)]
In handle_body only read a line if we don't already have one.

This prepares for detecting non-email patches that don't have
mail headers.  In which case we have already read the first
line so handle_body should not ignore it.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRefactor commit messge handling.
Eric W. Biederman [Tue, 23 May 2006 19:47:28 +0000 (13:47 -0600)]
Refactor commit messge handling.

- Move handle_info into main so it is called once
  after everything has been parsed.  This allows the removal
  of a static variable and removes two duplicate calls.

- Move parsing of inbody headers into handle_commit.
  This means we parse the in-body headers after we have decoded
  the character set, and it removes code duplication between
  handle_multipart_one_part and handle_body.

- Change the flag indicating that we have seen an in body
  prefix header into another bit in seen.
  This is a little more general and allows the possibility of parsing
  in body headers after the body message has begun.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMove B and Q decoding into check header.
Eric W. Biederman [Tue, 23 May 2006 19:45:37 +0000 (13:45 -0600)]
Move B and Q decoding into check header.

B and Q decoding is not appropriate for in body headers, so move
it up to where we explicitly know we have a real email header.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMake read_one_header_line return a flag not a length.
Eric W. Biederman [Tue, 23 May 2006 19:44:11 +0000 (13:44 -0600)]
Make read_one_header_line return a flag not a length.

Currently we only use the return value from read_one_header line
to tell if the line we have read is a header or not.  So make
it a flag.  This paves the way for better email detection.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoadd more informative error messages to git-mktag
Björn Engelmann [Tue, 23 May 2006 18:20:09 +0000 (20:20 +0200)]
add more informative error messages to git-mktag

Signed-off-by: Björn Engelmann <BjEngelmann@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoremove the artificial restriction tagsize < 8kb
Björn Engelmann [Tue, 23 May 2006 18:19:04 +0000 (20:19 +0200)]
remove the artificial restriction tagsize < 8kb

Signed-off-by: Björn Engelmann <BjEngelmann@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoBuiltin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree.
Peter Eriksen [Tue, 23 May 2006 12:15:36 +0000 (14:15 +0200)]
Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree.

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoBuiltin git-show-branch.
Peter Eriksen [Tue, 23 May 2006 12:15:35 +0000 (14:15 +0200)]
Builtin git-show-branch.

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoBuiltin git-apply.
Peter Eriksen [Tue, 23 May 2006 12:15:34 +0000 (14:15 +0200)]
Builtin git-apply.

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoBuiltin git-commit-tree.
Peter Eriksen [Tue, 23 May 2006 12:15:33 +0000 (14:15 +0200)]
Builtin git-commit-tree.

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoBuiltin git-read-tree.
Peter Eriksen [Tue, 23 May 2006 12:15:32 +0000 (14:15 +0200)]
Builtin git-read-tree.

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoBuiltin git-tar-tree.
Peter Eriksen [Tue, 23 May 2006 12:15:31 +0000 (14:15 +0200)]
Builtin git-tar-tree.

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoBuiltin git-ls-tree.
Peter Eriksen [Tue, 23 May 2006 12:15:30 +0000 (14:15 +0200)]
Builtin git-ls-tree.

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoBuiltin git-ls-files.
Peter Eriksen [Tue, 23 May 2006 12:15:29 +0000 (14:15 +0200)]
Builtin git-ls-files.

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin-rm: squelch compiler warnings.
Junio C Hamano [Tue, 23 May 2006 08:31:38 +0000 (01:31 -0700)]
builtin-rm: squelch compiler warnings.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAdd git-quiltimport to .gitignore.
Peter Eriksen [Mon, 22 May 2006 13:46:25 +0000 (15:46 +0200)]
Add git-quiltimport to .gitignore.

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsimport: introduce _fetchfile() method and used a 1M buffer to read()
Martin Langhoff [Tue, 23 May 2006 08:08:58 +0000 (20:08 +1200)]
cvsimport: introduce _fetchfile() method and used a 1M buffer to read()

File retrieval from the socket is now moved to _fetchfile() and we now
cap reads at 1MB. This should limit the memory growth of the cvsimport
process.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsimport: cleanup commit function
Jeff King [Tue, 23 May 2006 07:27:46 +0000 (03:27 -0400)]
cvsimport: cleanup commit function

This change attempts to clean up the commit function to make it a bit
easier to read (or at least the first half of it). It also improves
robustness and performance. Specifically:
  - report get_headref errors on opening ref unless the error is ENOENT
  - use regex to check for sha1 instead of length
  - use lexically scoped filehandles which get cleaned up automagically
  - check for error on both 'print' and 'close' (since output is buffered)
  - avoid "fork, do some perl, then exec" in commit(). It's not necessary,
    and we probably end up COW'ing parts of the perl process. Plus the code
    is much smaller because we can use open2()
  - avoid calling strftime over and over (mainly a readability cleanup)

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsimport: use git-update-index --index-info
Jeff King [Tue, 23 May 2006 07:27:45 +0000 (03:27 -0400)]
cvsimport: use git-update-index --index-info

This should reduce the number of git-update-index forks required per
commit. We now do adds/removes in one call, and we are no longer forced to
deal with argv limitations.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit status: skip empty directories, and add -u to show all untracked files
Matthias Lederhofer [Mon, 22 May 2006 21:02:06 +0000 (23:02 +0200)]
git status: skip empty directories, and add -u to show all untracked files

By default, we use --others --directory to show uninteresting
directories (to get user's attention) without their contents (to
unclutter output).  Showing empty directories do not make sense,
so pass --no-empty-directory when we do so.

Giving -u (or --untracked) disables this uncluttering to let the
user get all untracked files.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsimport: repack every kilo-commits.
Linus Torvalds [Tue, 23 May 2006 02:28:37 +0000 (19:28 -0700)]
cvsimport: repack every kilo-commits.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Acked-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsimport: introduce -L<imit> option to workaround memory leaks
Martin Langhoff [Mon, 22 May 2006 11:38:08 +0000 (23:38 +1200)]
cvsimport: introduce -L<imit> option to workaround memory leaks

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoRemove possible segfault in http-fetch.
Sean [Sat, 20 May 2006 22:46:33 +0000 (18:46 -0400)]
Remove possible segfault in http-fetch.

Free the curl string lists after running http_cleanup to
avoid an occasional segfault in the curl library.  Seems
to only occur if the website returns a 405 error.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoInstall git builtins into gitexecdir rather than bindir.
Sean [Mon, 22 May 2006 04:42:59 +0000 (00:42 -0400)]
Install git builtins into gitexecdir rather than bindir.

Moving "git-cmd" commands out of the path and into a special
git exec path, should include the builtins.

[jc: fixed the case where bindir == gitexecdir - ln -f fails
 with a complaint that src and dst are the same, likewise for
 the fallback cp.]

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoChange GIT-VERSION-GEN to call git commands with "git" not "git-".
Sean [Mon, 22 May 2006 04:39:52 +0000 (00:39 -0400)]
Change GIT-VERSION-GEN to call git commands with "git" not "git-".

GIT-VERSION-GEN can incorrectly return a default version of
"v1.3.GIT" because it tries to execute git commands using the
"git-cmd" format that expects all git commands to be in the $PATH.
Convert these to  "git cmd" format so that a proper answer is
returned even when the git commands have been moved out of the
$PATH and into a $gitexecdir.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsimport: replace anonymous sub ref with a normal sub
Martin Langhoff [Mon, 22 May 2006 12:45:39 +0000 (00:45 +1200)]
cvsimport: replace anonymous sub ref with a normal sub

commit() does not need to be an anonymous subreference. Keep it simple.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocvsimport: minor fixups
Martin Langhoff [Mon, 22 May 2006 12:45:47 +0000 (00:45 +1200)]
cvsimport: minor fixups

Cleanup @skipped after it's used. Close a fhandle.
Removing suspects one at a time.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoProblem: 'trap...exit' causes error message when /bin/sh is ash.
Yakov Lerner [Mon, 22 May 2006 19:34:00 +0000 (22:34 +0300)]
Problem: 'trap...exit' causes error message when /bin/sh is ash.

Problem: 'trap...exit' causes error message when /bin/sh is ash.
Fix: Change 'trap...exit' to 'trap...0' like in other scripts.

Signed-off-by: Yakov Lerner <iler.ml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoAvoid segfault in diff --stat rename output.
Sean [Tue, 23 May 2006 00:36:34 +0000 (20:36 -0400)]
Avoid segfault in diff --stat rename output.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoTutorial #2: broken link fix.
Junio C Hamano [Mon, 22 May 2006 22:34:40 +0000 (15:34 -0700)]
Tutorial #2: broken link fix.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit help: remove whatchanged from list of common commands
Martin Waitz [Mon, 22 May 2006 10:09:14 +0000 (12:09 +0200)]
git help: remove whatchanged from list of common commands

whatchanged is replaced by git log now.

Signed-off-by: Martin Waitz
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofetch-pack: output refs in the order they were given on the command line.
Junio C Hamano [Thu, 11 May 2006 22:28:44 +0000 (15:28 -0700)]
fetch-pack: output refs in the order they were given on the command line.

Currently, fetched refs are output in the order the remote side
happened to send them.  This changes the order to match the
order of refs that were given on the command line.  To the
existing core callers (git-fetch and git-clone) this does not
make any difference, but for other Porcelain use, it would be
more intuitive.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agov266
Kay Sievers [Mon, 22 May 2006 12:31:09 +0000 (14:31 +0200)]
v266

18 years agoremove Christian's email address
Kay Sievers [Mon, 22 May 2006 12:30:47 +0000 (14:30 +0200)]
remove Christian's email address

18 years agodiff: minor option combination fix.
Junio C Hamano [Mon, 22 May 2006 07:31:02 +0000 (00:31 -0700)]
diff: minor option combination fix.

output_format == DIFFSTAT and with_stat == true does not make sense, and
the way the code is structured it causes trouble.  Avoid it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agobuiltin format-patch: squelch content-type for 7-bit ASCII
Junio C Hamano [Mon, 22 May 2006 06:55:00 +0000 (23:55 -0700)]
builtin format-patch: squelch content-type for 7-bit ASCII

When --attach is not used, usually we do not say Content-Type:
and fluff, but if the commit message is not 7-bit ASCII, mark
it as "text/plain; charset=UTF-8".  This unclutters output
somewhat.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoCMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields.
Junio C Hamano [Tue, 16 May 2006 09:29:42 +0000 (02:29 -0700)]
CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields.

By convention, the commit message and the author/committer names
in the commit objects are UTF-8 encoded.  When formatting for
e-mails, Q-encode them according to RFC 2047.

While we are at it, generate the content-type and
content-transfer-encoding headers as well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agomailinfo: skip bogus UNIX From line inside body
Junio C Hamano [Mon, 22 May 2006 00:15:06 +0000 (17:15 -0700)]
mailinfo: skip bogus UNIX From line inside body

Sometimes people just include the whole format-patch output in
the commit e-mail.  Detect it and skip the bogus ">From " line.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotutorial-2: typofix in examples.
Junio C Hamano [Mon, 22 May 2006 00:37:25 +0000 (17:37 -0700)]
tutorial-2: typofix in examples.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotutorial: add discussion of index file, object database
J. Bruce Fields [Sun, 21 May 2006 23:49:34 +0000 (19:49 -0400)]
tutorial: add discussion of index file, object database

Add a sequel to tutorial.txt which discusses the index file and
the object database.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotutorial: expanded discussion of commit history
J. Bruce Fields [Sun, 21 May 2006 20:54:05 +0000 (16:54 -0400)]
tutorial: expanded discussion of commit history

Expand the history-browsing section of the tutorial a bit, in part to
address Junio's suggestion that we mention "git grep" and Linus's
complaint that people are missing the flexibility of the commandline
interfaces for selecting commits.

This reads a little more like a collection of examples than a
"tutorial", but maybe that's what people need at this point.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agotutorial: replace "whatchanged" by "log"
J. Bruce Fields [Sun, 21 May 2006 20:52:34 +0000 (16:52 -0400)]
tutorial: replace "whatchanged" by "log"

Junio suggested changing references to git-whatchanged to git-log.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoNO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin).
Yakov Lerner [Sun, 21 May 2006 21:37:00 +0000 (00:37 +0300)]
NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin).

For systems which lack inet_ntop(), this adds compat/inet_ntop.c,
and related build constant, NO_INET_NTOP. Older Cygwin(s) lack
inet_ntop().

Signed-off-by: Yakov Lerner <iler.ml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoremove superflous "const"
Alex Riesen [Sun, 21 May 2006 20:45:46 +0000 (22:45 +0200)]
remove superflous "const"

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-rebase: use canonical A..B syntax to format-patch
Junio C Hamano [Sun, 21 May 2006 10:16:38 +0000 (03:16 -0700)]
git-rebase: use canonical A..B syntax to format-patch

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agocheckdiff_consume: strtol parameter fix.
Junio C Hamano [Sun, 21 May 2006 10:01:59 +0000 (03:01 -0700)]
checkdiff_consume: strtol parameter fix.

The second parameter is not the end of string input; it is
the optional return value to retrieve where the parser stopped.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogit-format-patch: now built-in.
Junio C Hamano [Sun, 21 May 2006 09:48:21 +0000 (02:48 -0700)]
git-format-patch: now built-in.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoElaborate on why ':' is a bad idea in a ref name.
Shawn Pearce [Sun, 21 May 2006 02:03:14 +0000 (22:03 -0400)]
Elaborate on why ':' is a bad idea in a ref name.

With the new cat-file syntax of 'v1.3.3:refs.c' we should mention
it as part of the reason why ':' is not permitted in a ref name.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoReference git-check-ref-format in git-branch.
Shawn Pearce [Sun, 21 May 2006 01:54:46 +0000 (21:54 -0400)]
Reference git-check-ref-format in git-branch.

Its nice to have git-check-ref-format actually get mentioned in
git-branch's documentation as the syntax of a ref name must conform
to what is described in git-check-ref-format.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agofmt-patch: Support --attach
Johannes Schindelin [Sat, 20 May 2006 13:40:29 +0000 (15:40 +0200)]
fmt-patch: Support --attach

This patch touches a couple of files, because it adds options to print a
custom text just after the subject of a commit, and just after the
diffstat.

[jc: made "many dashes" used as the boundary leader into a single
 variable, to reduce the possibility of later tweaks to miscount the
 number of dashes to break it.]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'master' into js/fmt-patch
Junio C Hamano [Sun, 21 May 2006 08:34:54 +0000 (01:34 -0700)]
Merge branch 'master' into js/fmt-patch

* master: (119 commits)
  diff family: add --check option
  Document that "git add" only adds non-ignored files.
  Add a conversion tool to migrate remote information into the config
  fetch, pull: ask config for remote information
  Fix build procedure for builtin-init-db
  read-tree -m -u: do not overwrite or remove untracked working tree files.
  apply --cached: do not check newly added file in the working tree
  Implement a --dry-run option to git-quiltimport
  Implement git-quiltimport
  Revert "builtin-grep: workaround for non GNU grep."
  builtin-grep: workaround for non GNU grep.
  builtin-grep: workaround for non GNU grep.
  git-am: use apply --cached
  apply --cached: apply a patch without using working tree.
  apply --numstat: show new name, not old name.
  Documentation/Makefile: create tarballs for the man pages and html files
  Allow pickaxe and diff-filter options to be used by git log.
  Libify the index refresh logic
  Builtin git-init-db
  Remove unnecessary local in get_ref_sha1.
  ...

18 years agodiff family: add --check option
Johannes Schindelin [Sat, 20 May 2006 21:43:13 +0000 (23:43 +0200)]
diff family: add --check option

Actually, it is a diff option now, so you can say

git diff --check

to ask if what you are about to commit is a good patch.

[jc: this also would work for fmt-patch, but the point is that
 the check is done before making a commit.  format-patch is run
 from an already created commit, and that is too late to catch
 whitespace damaged change.]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoDocument that "git add" only adds non-ignored files.
Santi [Fri, 19 May 2006 21:02:34 +0000 (23:02 +0200)]
Document that "git add" only adds non-ignored files.

Signed-off-by: Santi BĂ©jar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agogitk: Highlight paths of interest in tree view as well
Paul Mackerras [Sat, 20 May 2006 12:56:27 +0000 (22:56 +1000)]
gitk: Highlight paths of interest in tree view as well

With this, when the file list window is in tree view mode, we highlight
the paths of interest.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agogitk: Highlight entries in the file list as well
Paul Mackerras [Sat, 20 May 2006 11:31:52 +0000 (21:31 +1000)]
gitk: Highlight entries in the file list as well

This applies a bold highlight to entries in the file list pane in the
bottom right corner when it is displaying the list of changed files.
This doesn't yet highlight file list entries when it is in tree view
mode.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[PATCH] gitk: Display commit messages with word wrap
Sergey Vlasov [Mon, 15 May 2006 15:13:14 +0000 (19:13 +0400)]
[PATCH] gitk: Display commit messages with word wrap

Some people put very long strings into commit messages, which then
become invisible in gitk (word wrapping in the commit details window is
turned off, and there is no horizontal scroll bar).  Enabling word wrap
for just the commit message looks much better.

Wrapping is controlled by the "wrapcomment" option in ~/.gitk.  By
default this option is set to "none", which disables wrapping; setting
it to "word" enables word wrap for commit messages.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agoMerge branch 'lt/dirwalk' into jc/dirwalk-n-cache-tree
Junio C Hamano [Sat, 20 May 2006 08:28:49 +0000 (01:28 -0700)]
Merge branch 'lt/dirwalk' into jc/dirwalk-n-cache-tree

This commit is what this branch is all about.  It records the
evil merge needed to adjust built-in git-add and git-rm for
the cache-tree extension.

* lt/dirwalk:
  Add builtin "git rm" command
  Move pathspec matching from builtin-add.c into dir.c
  Prevent bogus paths from being added to the index.
  builtin-add: fix unmatched pathspec warnings.
  Remove old "git-add.sh" remnants
  builtin-add: warn on unmatched pathspecs
  Do "git add" as a builtin
  Clean up git-ls-file directory walking library interface
  libify git-ls-files directory traversal

Conflicts:

Makefile
builtin.h
git.c
update-index.c

18 years agoMerge branch 'jc/cache-tree' into jc/dirwalk-n-cache-tree
Junio C Hamano [Sat, 20 May 2006 07:56:11 +0000 (00:56 -0700)]
Merge branch 'jc/cache-tree' into jc/dirwalk-n-cache-tree

* jc/cache-tree: (24 commits)
  Fix crash when reading the empty tree
  fsck-objects: do not segfault on missing tree in cache-tree
  cache-tree: a bit more debugging support.
  read-tree: invalidate cache-tree entry when a new index entry is added.
  Fix test-dump-cache-tree in one-tree disappeared case.
  fsck-objects: mark objects reachable from cache-tree
  cache-tree: replace a sscanf() by two strtol() calls
  cache-tree.c: typefix
  test-dump-cache-tree: validate the cached data as well.
  cache_tree_update: give an option to update cache-tree only.
  read-tree: teach 1-way merege and plain read to prime cache-tree.
  read-tree: teach 1 and 2 way merges about cache-tree.
  update-index: when --unresolve, smudge the relevant cache-tree entries.
  test-dump-cache-tree: report number of subtrees.
  cache-tree: sort the subtree entries.
  Teach fsck-objects about cache-tree.
  index: make the index file format extensible.
  cache-tree: protect against "git prune".
  Add test-dump-cache-tree
  Use cache-tree in update-index.
  ...

18 years agobuilt-in tar-tree and remote tar-tree
Junio C Hamano [Fri, 19 May 2006 01:46:44 +0000 (18:46 -0700)]
built-in tar-tree and remote tar-tree

This makes tar-tree a built-in.  As an added bonus, you can now
say:

git tar-tree --remote=remote-repository <ent> [<base>]

This does not work with git-daemon yet, but should work with
localhost and git over ssh transports.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years agoMerge branch 'js/fetchconfig'
Junio C Hamano [Sat, 20 May 2006 00:44:07 +0000 (17:44 -0700)]
Merge branch 'js/fetchconfig'

* js/fetchconfig:
  Add a conversion tool to migrate remote information into the config
  fetch, pull: ask config for remote information

18 years agoAdd builtin "git rm" command
Linus Torvalds [Fri, 19 May 2006 23:19:34 +0000 (16:19 -0700)]
Add builtin "git rm" command

This changes semantics very subtly, because it adds a new atomicity
guarantee.

In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.

This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.

So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.

This is only an issue with "-f", of course.

I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).

The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>