git.git
19 years ago[PATCH] Pull misc objects
Daniel Barkalow [Wed, 22 Jun 2005 00:35:53 +0000 (20:35 -0400)]
[PATCH] Pull misc objects

Make pull fetch whatever is specified, parse it to figure out what it is, and
then process it appropriately. This also supports getting tag objects, and
getting whatever they tag.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Parse tags for absent objects
Daniel Barkalow [Wed, 22 Jun 2005 00:35:10 +0000 (20:35 -0400)]
[PATCH] Parse tags for absent objects

Handle parsing a tag for a non-present object. This adds a function to lookup
an object with lookup_* for * in a string, so that it can get the right storage
based on the "type" line in the tag.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoFix typo in git-checkout-script.
Linus Torvalds [Wed, 22 Jun 2005 00:12:38 +0000 (17:12 -0700)]
Fix typo in git-checkout-script.

The confusion between "revs" vs "refs" caused us to not find the branch
name, which in turn meant that we never switched the HEAD over to it.

19 years agoRemove MERGE_HEAD in "git checkout/reset"
Linus Torvalds [Tue, 21 Jun 2005 22:40:00 +0000 (15:40 -0700)]
Remove MERGE_HEAD in "git checkout/reset"

Both of these scripts will end up resetting the index to some specific
head, and any unresolved merge will be forgotten.

19 years agoClean up different special *HEAD handling
Linus Torvalds [Tue, 21 Jun 2005 21:04:13 +0000 (14:04 -0700)]
Clean up different special *HEAD handling

We codify the following different heads (in addition to the main "HEAD",
which points to the current branch, of course):

 - FETCH_HEAD

   Populated by "git fetch"

 - ORIG_HEAD

   The old HEAD before a "git pull/resolve" (successful or not)

 - LAST_MERGE

   The HEAD we're currently merging in "git pull/resolve"

 - MERGE_HEAD

   The previous head of a unresolved "git pull", which gets committed by
   a "git commit" after manually resolving the result

We used to have "MERGE_HEAD" be populated directly by the fetch, and we
removed ORIG_HEAD and LAST_MERGE too aggressively.

19 years ago[PATCH] Fix several gcc4 signedness warnings
Mika Kukkonen [Tue, 21 Jun 2005 20:04:33 +0000 (23:04 +0300)]
[PATCH] Fix several gcc4 signedness warnings

Here is a patch that fixes several gcc4 warnings about different signedness,
all between char and unsigned char. I tried to keep the patch minimal
so resertod to casts in three places.

Signed-off-by: Mika Kukkonen <mikukkon@iki.fi>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit checkout: fix default head case
Linus Torvalds [Tue, 21 Jun 2005 18:14:47 +0000 (11:14 -0700)]
git checkout: fix default head case

The "${new=$old}" syntax only works for an undefined 'new', not for an
empty one. I knew that. Really. I'm not stupid.

19 years agoMake "git checkout" know about different branches
Linus Torvalds [Tue, 21 Jun 2005 18:03:11 +0000 (11:03 -0700)]
Make "git checkout" know about different branches

Now "git checkout xyzzy" will check out branch "xyzzy" and
switch the HEAD to it.

19 years ago"git checkout": add "-u" flag to update HEAD conditionally
Linus Torvalds [Tue, 21 Jun 2005 16:59:26 +0000 (09:59 -0700)]
"git checkout": add "-u" flag to update HEAD conditionally

And fix braino on testing "-f".

19 years agoAdd "git checkout" that does what the name suggests
Linus Torvalds [Tue, 21 Jun 2005 16:47:37 +0000 (09:47 -0700)]
Add "git checkout" that does what the name suggests

It is careful by default and refuses to overwrite old info, but if you
want to force everything to be re-read, use the "-f" flag.

Some day I'll make it take individual filenames too. Right now
it's all-or-nothing.

19 years ago[PATCH] fix scalability problems with git-deltafy-script
Nicolas Pitre [Tue, 21 Jun 2005 14:18:00 +0000 (10:18 -0400)]
[PATCH] fix scalability problems with git-deltafy-script

Current version would spin forever and exhaust memory while attempting
to sort all files from all revisions at once, until it dies before even
doing any real work.  This is especially noticeable when used on a big
repository like the imported bkcvs repo for the Linux kernel.

This patch allows for batching the sort to put a bound on needed
resources and making progress early, as well as including some small
cleanups.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] git-apply: Don't barf when --stat'ing a diff with no line changes.
Sven Verdoolaege [Tue, 21 Jun 2005 15:14:30 +0000 (17:14 +0200)]
[PATCH] git-apply: Don't barf when --stat'ing a diff with no line changes.

Diffs with only mode changes didn't pass through git-apply --stat.

[ Linus' note: they did for me, on my ppc64, where division by zero just
  silently returns zero.  Duh.  ]

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoLet "git commit" take arguments for files to commit.
Linus Torvalds [Tue, 21 Jun 2005 04:20:41 +0000 (21:20 -0700)]
Let "git commit" take arguments for files to commit.

It does a "git-update-cache" on the arguments, meaning that you can
commit files without doing a separate "git-update-cache".  This commit
was done with

git commit git-commit-script

for example.

19 years agoAdd "-q" flag to git-update-cache
Linus Torvalds [Tue, 21 Jun 2005 04:18:54 +0000 (21:18 -0700)]
Add "-q" flag to git-update-cache

It suppresses the "needs update" message for subsequent "--refresh"
cases (but not other errors).

Will be useful for "git commit". Stay tuned.

19 years agoChange parent syntax to "xyz^" instead of "xyz.p"
Linus Torvalds [Tue, 21 Jun 2005 04:06:47 +0000 (21:06 -0700)]
Change parent syntax to "xyz^" instead of "xyz.p"

The ".pN" thing might be a common ending of a tag, and in
contrast, ^ already is a special character for revisions
so use that instead.

19 years agoMake rev-parse understand "extended sha1" syntax
Linus Torvalds [Tue, 21 Jun 2005 03:28:09 +0000 (20:28 -0700)]
Make rev-parse understand "extended sha1" syntax

You can say "HEAD.p" for the "parent of HEAD". It nests, so

HEAD.p2.p

means parent of second parent of HEAD (which obviously depends
on HEAD being a merge).

19 years agoKeep the parents in order when parsing commits
Linus Torvalds [Tue, 21 Jun 2005 03:26:03 +0000 (20:26 -0700)]
Keep the parents in order when parsing commits

We used to keep the parents in reverse order in the commit_list.  Most
users don't care, but it's wrong, and the next commit does care.

19 years agogit-rev-parse: flush "default" head when encountering something unexpected
Linus Torvalds [Mon, 20 Jun 2005 23:14:13 +0000 (16:14 -0700)]
git-rev-parse: flush "default" head when encountering something unexpected

The unexpected thing is likely a pathname, we need the default for that
too.

19 years ago[PATCH] git-resolve-script: Add LAST_MERGE and use git-rev-parse
Dan Holmsand [Mon, 20 Jun 2005 18:52:38 +0000 (20:52 +0200)]
[PATCH] git-resolve-script: Add LAST_MERGE and use git-rev-parse

Make git-resolve-script only write MERGE_HEAD if a merge actually
occurred. All merge failures leave ORIG_HEAD and LAST_MERGE
behind (instead of ORIG_HEAD and MERGE_HEAD).

Use git-rev-parse to expand arguments (and check for bad ones).

Signed-off-by: Dan Holmsand <holmsand@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-rev-parse: parse ".." before simple SHA1's
Linus Torvalds [Mon, 20 Jun 2005 15:29:13 +0000 (08:29 -0700)]
git-rev-parse: parse ".." before simple SHA1's

This fixes "<hexsha1>..*", since get_sha1() will happily ignore any
garbage at the end and thus we never got to the ".." check before.

19 years agoAvoid gcc warning in diff-stages.c
Linus Torvalds [Mon, 20 Jun 2005 03:15:22 +0000 (20:15 -0700)]
Avoid gcc warning in diff-stages.c

Put explicit parentheses around && in ||-expression.

19 years ago[PATCH] Fix for --merge-order, --max-age interaction issue
Jon Seymour [Mon, 20 Jun 2005 02:29:41 +0000 (12:29 +1000)]
[PATCH] Fix for --merge-order, --max-age interaction issue

This patch fixes a problem reported by Paul Mackerras regarding the interaction
of the --merge-order and --max-age switches of git-rev-list.

This patch applies to the current Linus HEAD. A cleaner fix for the same problem
in my current HEAD will follow later.

With this change, --merge-order produces the same result as no --merge-order
on the linux-2.6 git repository, to wit:

$> git-rev-list --max-age=1116330140 bcfff0b471a60df350338bcd727fc9b8a6aa54b2 | wc -l
655
$> git-rev-list --merge-order --max-age=1116330140 bcfff0b471a60df350338bcd727fc9b8a6aa54b2 | wc -l
655

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Prevent git-rev-list without --merge-order producing duplicates in output
Jon Seymour [Mon, 20 Jun 2005 02:29:38 +0000 (12:29 +1000)]
[PATCH] Prevent git-rev-list without --merge-order producing duplicates in output

If b is reachable from a, then:

 git-rev-list a b

argument would print one of the commits twice.

This patch fixes that problem. A previous problem fixed it for the
--merge-order switch.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Prevent git-rev-list --merge-order producing duplicates in the output
Jon Seymour [Mon, 20 Jun 2005 02:29:36 +0000 (12:29 +1000)]
[PATCH] Prevent git-rev-list --merge-order producing duplicates in the output

If a is reachable from b, then git-rev-list --merge-order b a would
produce a duplicate output of b.

This causes a problem for an upcoming version of gitk since it
breaks the --merge-order ordering invariant.

This patch fixes the problem for the --merge-order switch. A subsequent
patch will fix the problem for the non --merge-order switch.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Relaxes error checking in epoch.c to allow duplicate parents
Jon Seymour [Mon, 20 Jun 2005 02:29:33 +0000 (12:29 +1000)]
[PATCH] Relaxes error checking in epoch.c to allow duplicate parents

Given that real trees in the wild include parents with duplicate parents, I have relaxed
over-zealous error checking in epoch.c and dealt with the problem a different way - duplicate
parents are now silently ignored.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Fixes problem with --merge-order head ^head
Jon Seymour [Mon, 20 Jun 2005 02:29:31 +0000 (12:29 +1000)]
[PATCH] Fixes problem with --merge-order head ^head

git-rev-list --merge-order HEAD ^HEAD was faulting rather than generating an empty output.

This patch fixes that problem.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Tweaked --merge-order --show-breaks output in case specified head has no...
Jon Seymour [Mon, 20 Jun 2005 02:29:29 +0000 (12:29 +1000)]
[PATCH] Tweaked --merge-order --show-breaks output in case specified head has no parent

      git-rev-list --merge-order --show-breaks root

Was outputing:

| root

It now outputs:

= root

Which is consistent with the behaviour of other cases.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Additional git-rev-list unit tests to demonstrate problems that require fixes
Jon Seymour [Mon, 20 Jun 2005 02:29:26 +0000 (12:29 +1000)]
[PATCH] Additional git-rev-list unit tests to demonstrate problems that require fixes

1. --merge-order doesn't deal properly with a specified head that has no parent

   * FAIL 11: head has no parent

2. --merge-order doesn't deal properly with arguments of the form
     head ^head

   * FAIL 30: head ^head --merge-order git-rev-list --merge-order
     --show-breaks a3 ^a3

3. if one of the specified heads is reachable from the other, the
   head gets printed twice and this causes problems for upcoming
   versions of gitk. This is true for both --merge-order and non
   --merge-order style of invocations.
    * FAIL 24: one specified head reachable from another a4, c3, --merge-order
    * FAIL 26: one specified head reachable from another a4, c3, no --merge-order
    * FAIL 27: one specified head reachable from another c3, a4, no --merge-order

4. --merge-order aborts with commits that list the same parent twice...it should handle it more gracefully.
    * no longer unit testable

5. broken interaction between --merge-order and --max-age
   previously posted as:

    "[PATCH 1/2] Test case that demonstrates problem with --merge-order, --max-age interaction"
    * FAIL 23: --max-age=c3, --merge-order

Later patches in this patch set fix these problems.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Rework -B output.
Junio C Hamano [Sun, 19 Jun 2005 20:17:50 +0000 (13:17 -0700)]
[PATCH] Rework -B output.

Patch for a completely rewritten file detected by the -B flag
was shown as a pair of creation followed by deletion in earlier
versions.  This was an misguided attempt to make reviewing such
a complete rewrite easier, and unnecessarily ended up confusing
git-apply.  Instead, show the entire contents of old version
prefixed with '-', followed by the entire contents of new
version prefixed with '+'.  This gives the same easy-to-review
for human consumer while keeping it a single, regular
modification patch for machine consumption, something that even
GNU patch can grok.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Update diff documentation.
Junio C Hamano [Sun, 19 Jun 2005 20:14:53 +0000 (13:14 -0700)]
[PATCH] Update diff documentation.

This updates diff documentation to discuss --find-copies-harder,
and adds descriptions for options that were not described
earlier.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Make -C less eager.
Junio C Hamano [Sun, 19 Jun 2005 20:14:05 +0000 (13:14 -0700)]
[PATCH] Make -C less eager.

Like diff-tree, this patch makes -C option for diff-* brothers
to use only pre-image of modified files as rename/copy detection
by default.  Give --find-copies-harder to use unmodified files
to find copies from as well.

This also fixes "diff-files -C" problem earlier noticed by
Linus.  It was feeding the null sha1 even when the file in the
work tree was known to match what is in the index file.  This
resulted in diff-files showing everything in the project.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoMake "git commit" clean up after itself
Linus Torvalds [Mon, 20 Jun 2005 02:57:01 +0000 (19:57 -0700)]
Make "git commit" clean up after itself

Noted by Jeff.

19 years agoClean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges.
Linus Torvalds [Mon, 20 Jun 2005 02:42:21 +0000 (19:42 -0700)]
Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges.

Otherwise you'll be bitten by a stale MERGE_HEAD like Jeff was..

19 years ago[PATCH] cvs2git.c: support incremental conversion
Panagiotis Issaris [Fri, 17 Jun 2005 16:26:57 +0000 (18:26 +0200)]
[PATCH] cvs2git.c: support incremental conversion

Add -u option to indicate incremental conversion.

I wanted to be able to track CVS repositories in a GIT repository.  The
cvs2git program worked fine with the initial import but needed a tiny
modification to enable me to resync the GIT repository with the updated
CVS tree.

[ The original version of this patch failed to track the correct
  branch on the first new commit. Fixed and tested by Sven. ]

Signed-off-by: Panagiotis Issaris <takis@lumumba.luc.ac.be>
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] ssh-push.c: Fix handling of ssh://host/path URLs
Sven Verdoolaege [Fri, 17 Jun 2005 08:13:18 +0000 (10:13 +0200)]
[PATCH] ssh-push.c: Fix handling of ssh://host/path URLs

Previous patch to fix host:path notation broke
handling of ssh://host/path notation.

Signed-off-by: Sven Verdoolaege <skimo@liacs.nl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-commit-tree: ignore duplicate parents
Linus Torvalds [Sun, 19 Jun 2005 17:40:10 +0000 (10:40 -0700)]
git-commit-tree: ignore duplicate parents

But warn about them.  If somebody really ends up later wanting to
explicitly add a note that something has the same parent twice (who
knows, there are strange people around), we can add a flag to say that
it's expected and ok.

This was brought on by a commit in the kernel tree, where a repeated
merge caused a duplicate parent.

Parent duplicates aren't "wrong" per se, they're just in practice not
something you are ever interested in.

19 years agoFix up INSTALL and "git add"
Linus Torvalds [Sun, 19 Jun 2005 06:44:54 +0000 (23:44 -0700)]
Fix up INSTALL and "git add"

As suggested by Junio

19 years agoread-cache.c: remove stray debugging printf
Linus Torvalds [Sun, 19 Jun 2005 06:34:12 +0000 (23:34 -0700)]
read-cache.c: remove stray debugging printf

Pointed out by Junio, part of my debugging of the rewrite of the
file/dir conflict handling.

19 years agoRe-implement "check_file_directory_conflict()"
Linus Torvalds [Sun, 19 Jun 2005 03:21:34 +0000 (20:21 -0700)]
Re-implement "check_file_directory_conflict()"

This is (imho) more readable, and is also a lot faster.  The expense of
looking up sub-directory beginnings was killing us on things like
"git-diff-cache", even though that one didn't even care at all about the
file vs directory conflicts.

We really only care when somebody tries to add a conflicting name to
stage 0.

We should go through the conflict rules more carefully some day.

19 years agoAvoid warning about function without return.
Linus Torvalds [Sun, 19 Jun 2005 03:02:49 +0000 (20:02 -0700)]
Avoid warning about function without return.

Strangely, this warning only shows up when not compiling with "-O2",
which is why I didn't see it originally.

19 years ago[PATCH] cvs2git and file permissions
Sven Verdoolaege [Sat, 18 Jun 2005 22:31:15 +0000 (00:31 +0200)]
[PATCH] cvs2git and file permissions

git-cvs2git: propagate mode information

Let cvs checkout in a temporary directory rather than
using the pipe option to avoid loss of mode information.

Signed-off-by: Sven Verdoolaege <skimo@liacs.nl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoMake "pretty" commit logs always show merge information
Linus Torvalds [Sat, 18 Jun 2005 20:52:05 +0000 (13:52 -0700)]
Make "pretty" commit logs always show merge information

Otherwise the "git log" information doesn't tell enough to make sense of
a merge.

I'll need to add some parent information for regular entries too, I
think, but the merge is more important.

19 years agogit-rev-list: add "--bisect" flag to find the "halfway" point
Linus Torvalds [Sat, 18 Jun 2005 05:54:50 +0000 (22:54 -0700)]
git-rev-list: add "--bisect" flag to find the "halfway" point

This is useful for doing binary searching for problems.  You start with
a known good and known bad point, and you then test the "halfway" point
in between:

git-rev-list --bisect bad ^good

and you test that.  If that one tests good, you now still have a known
bad case, but two known good points, and you can bisect again:

git-rev-list --bisect bad ^good1 ^good2

and test that point.  If that point is bad, you now use that as your
known-bad starting point:

git-rev-list --bisect newbad ^good1 ^good2

and basically at every iteration you shrink your list of commits by
half: you're binary searching for the point where the troubles started,
even though there isn't a nice linear ordering.

19 years agoUse "-M" instead of "-C" for "git diff" and "git status"
Linus Torvalds [Fri, 17 Jun 2005 22:34:19 +0000 (15:34 -0700)]
Use "-M" instead of "-C" for "git diff" and "git status"

The "C" in "-C" may stand for "Cool", but it's also pretty slow, since
right now it leaves all unmodified files to be tested even if there are
no new files at all.  That just ends up being unacceptably slow for big
projects, especially if it's not all in the cache.

19 years agogit-apply: use default name for mode change patches
Linus Torvalds [Fri, 17 Jun 2005 22:23:40 +0000 (15:23 -0700)]
git-apply: use default name for mode change patches

Pure mode changes won't have the file-name in the extended header lines,
so make sure we pick it up from the default name from the "diff --git"
line.

19 years agoDon't use -C in "git diff"
Linus Torvalds [Fri, 17 Jun 2005 19:46:38 +0000 (12:46 -0700)]
Don't use -C in "git diff"

Right now it confuses at least git-diff-files, since it leaves
all the files (whether changed or not) in the diff queue.

19 years agoAdd some installation notes in INSTALL
Linus Torvalds [Fri, 17 Jun 2005 18:30:04 +0000 (11:30 -0700)]
Add some installation notes in INSTALL

Jens was the second person who hadn't heard of the "merge" program, and
didn't have it installed.  So document as many dependency and install
issues as I can think of.

19 years agogit-read-tree: fix "--reset" handling
Linus Torvalds [Wed, 15 Jun 2005 17:25:46 +0000 (10:25 -0700)]
git-read-tree: fix "--reset" handling

19 years agoUpdate tutorial a bit for scripted helpers.
Linus Torvalds [Wed, 15 Jun 2005 02:00:00 +0000 (19:00 -0700)]
Update tutorial a bit for scripted helpers.

19 years agoTrivial git script fixups
Linus Torvalds [Wed, 15 Jun 2005 01:56:05 +0000 (18:56 -0700)]
Trivial git script fixups

Fix permissions, and add trivial "reset" and "add" scripts.

The "reset" script just resets the index back to head, while the "add"
script is just a crutch for people used to do "cvs add".

19 years ago[PATCH] ssh-push: Don't add '/' to pathname
Sven Verdoolaege [Tue, 14 Jun 2005 10:37:38 +0000 (12:37 +0200)]
[PATCH] ssh-push: Don't add '/' to pathname

Paths in the host:path notation are usually interpreted
relative to the login directory rather than relative to
the root directory.

Signed-off-by: Sven Verdoolaege <skimo@liacs.nl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Unset TZ in t5000
Mark Allen [Tue, 14 Jun 2005 17:09:39 +0000 (10:09 -0700)]
[PATCH] Unset TZ in t5000

Unset TZ to force GMT in test #4 and add a set of parens around
the length function in the awk script.

Signed-off-by: Mark Allen <mrallen1@yahoo.com>
Acked-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoMake 'git' script be a bit more helpful on unrecognized commands
Linus Torvalds [Tue, 14 Jun 2005 18:01:49 +0000 (11:01 -0700)]
Make 'git' script be a bit more helpful on unrecognized commands

19 years agoMake "git commit" handle initial commits too
Linus Torvalds [Tue, 14 Jun 2005 17:20:14 +0000 (10:20 -0700)]
Make "git commit" handle initial commits too

No need to confuse ex-CVS users with a complex initial commit sequence.

19 years agogit-apply: normalize file mode when comparing with expected value
Linus Torvalds [Tue, 14 Jun 2005 03:41:38 +0000 (20:41 -0700)]
git-apply: normalize file mode when comparing with expected value

Sine git only saves the 'x' bit, we shouldn't compare the stat contents
directly.

19 years agoAdd "git diff" script
Linus Torvalds [Mon, 13 Jun 2005 22:09:34 +0000 (15:09 -0700)]
Add "git diff" script

It's a simple helper that depending on the arguments will either
use git-diff-files, git-diff-cache or git-diff-tree.

19 years agoTeach git-rev-parse about revision-specifying arguments
Linus Torvalds [Mon, 13 Jun 2005 18:14:20 +0000 (11:14 -0700)]
Teach git-rev-parse about revision-specifying arguments

Things like "--max-count=xxx" are "rev-only".

19 years agogit-whatchanged: use the git-rev-parse helper
Linus Torvalds [Mon, 13 Jun 2005 17:22:39 +0000 (10:22 -0700)]
git-whatchanged: use the git-rev-parse helper

So now you can say

git-whatchanged -p v2.6.12-rc5.. drivers/usb

and it will show you what changed (as a patch) in drivers/usb since the
v2.6.12-rc5 release.

19 years agogit-rev-parse: split "revs" and "non-revs"
Linus Torvalds [Mon, 13 Jun 2005 17:21:11 +0000 (10:21 -0700)]
git-rev-parse: split "revs" and "non-revs"

Sometimes we only want to output revisions, and sometimes we want to
only see the stuff that wasn't revisions.  Teach git-rev-parse to
understand the "--revs-only" and "--no-revs" flags.

19 years agoMake "git log" use the new git-rev-parse helper
Linus Torvalds [Mon, 13 Jun 2005 17:07:25 +0000 (10:07 -0700)]
Make "git log" use the new git-rev-parse helper

See the previous commit for explanations.

19 years agoAdd 'git-rev-parse' helper script
Linus Torvalds [Mon, 13 Jun 2005 17:06:50 +0000 (10:06 -0700)]
Add 'git-rev-parse' helper script

It's an incredibly cheesy helper that changes human-readable revision
arguments into the git-rev-list argument format.

You can use it to do something like this:

git-rev-list --pretty $(git-rev-parse --default HEAD "$@")

which is what git-log-script will become. Here git-rev-parse will
then allow you to use arguments like "v2.6.12-rc5.." or similar
human-readable ranges.

It's really quite stupid: "a..b" will be converted into "a" and "^b" if
"a" and "b" are valid object pointers.  And the "--default" case will be
used if nothing but flags have been seen, so that you can default to a
certain argument if there are no other ranges.

19 years agogit-apply: fix error handling for nonexistent files
Linus Torvalds [Mon, 13 Jun 2005 04:04:27 +0000 (21:04 -0700)]
git-apply: fix error handling for nonexistent files

Missing argument for error() function. We should really use the
gcc printf format checking capabilities.

19 years ago[PATCH] git cvsimport fuzz argument
Tommy M. McGuire [Fri, 10 Jun 2005 06:38:32 +0000 (01:38 -0500)]
[PATCH] git cvsimport fuzz argument

Add "-z fuzz" argument, passed to cvsps, and clean up argument
processing.  Also, use "cvsps --cvs-direct", which is is somewhat
faster.

Give the user the option of specifying the timestamp fuzz passed to
cvsps.  Looking at the other arguments to it, I can't see anything else
that would be sane to play with.  Also, use --cvs-direct, which speeds
up cvsps for remote repositories and doesn't seem to do anything bad to
local repositories.

Signed-off-by: Tommy McGuire <mcguire@crsr.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] cvs-migration.txt
Tommy M. McGuire [Fri, 10 Jun 2005 06:33:44 +0000 (01:33 -0500)]
[PATCH] cvs-migration.txt

Slightly expand the cvsimport description, and make a couple of syntax
edits.

The way I figure it, telling someone why cvsimport is taking so long
will improve their overall user experience.  :-)

Signed-off-by: Tommy McGuire <mcguire@crsr.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] git cvsimport sanity checking
Tommy M. McGuire [Fri, 10 Jun 2005 06:27:47 +0000 (01:27 -0500)]
[PATCH] git cvsimport sanity checking

This patch adds some sanity checking to git-cvsimport-script,
specifically forcing the use of cvsps -x (to get the latest information
from the repository, rather than whatever is in the cache) and aborting
early if cvsps does not produce any output.

I debated removing the $MODULE directory following an abort, but I
eventually decided leaving stuff behind would make debugging easier.  On
the other hand, this patch should help with the "cvsimport left me with
an empty repository" complaints.

Call cvsps with the -x flag, to get the current state of the repository,
and abort the cvs import early if cvsps does not produce any output.

Signed-off-by: Tommy McGuire <mcguire@crsr.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] cvsimport: allow remote CVS repos
Tommy M. McGuire [Fri, 10 Jun 2005 06:22:06 +0000 (01:22 -0500)]
[PATCH] cvsimport: allow remote CVS repos

Remove unneeded sanity tests.  Remote repositories do, indeed, just
work.

Signed-off-by: Tommy McGuire <mcguire@crsr.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] diff-stages: unuglify the too big main() function.
Junio C Hamano [Sat, 11 Jun 2005 01:44:36 +0000 (18:44 -0700)]
[PATCH] diff-stages: unuglify the too big main() function.

Split the core of the program, diff_stage, from one big "main()"
function that does it all and leave only the parameter parsing,
setup and finalize part in the main().

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] read-tree: loosen too strict index requirements
Junio C Hamano [Sat, 11 Jun 2005 09:53:57 +0000 (02:53 -0700)]
[PATCH] read-tree: loosen too strict index requirements

This patch teaches read-tree 3-way merge that, when only "the
other tree" changed a path, and if the index file already has
the same change, we are not in a situation that would clobber
the index and the work tree, and lets the merge succeed; this is
case #14ALT in t1000 test.  It does not change the result of the
merge, but prevents it from failing when it does not have to.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Finish making --emu23 equivalent to pure 2-way merge.
Junio C Hamano [Sat, 11 Jun 2005 09:50:51 +0000 (02:50 -0700)]
[PATCH] Finish making --emu23 equivalent to pure 2-way merge.

This adds #3ALT rule (and #2ALT rule for symmetry) to the
read-tree 3-way merge logic that collapses paths that are added
only in one branch and not in the other internally.

This makes --emu23 to succeed in the last remaining case where
the pure 2-way merge succeeded and earlier one failed.  Running
diff between t1001 and t1005 test scripts shows that the only
difference between the two is that --emu23 can leave the states
into separate stages so that the user can use usual 3-way merge
resolution techniques to carry forward the local changes when
pure 2-way merge would have refused to run.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] read-tree: fix too strong index requirement #5ALT
Junio C Hamano [Sat, 11 Jun 2005 01:37:47 +0000 (18:37 -0700)]
[PATCH] read-tree: fix too strong index requirement #5ALT

This fixes too strong index requirement 3-way merge enforces in
one case: the same file is added in both branches.

In this case, the original code insisted that if the index file
has that path, it must match our branch and be up-to-date.
However in this particular case, it only has to match it, and
can be dirty.  We just need to make sure that we keep the
work-tree copy instead of checking out the merge result.

The resolution of such a path, however, cannot be left to
outside script, because we will not keep the original stage0
entries for unmerged paths when read-tree finishes, and at that
point, the knowledge of "if we resolve it to match the new file
added in both branches, the merge succeeds and the work tree
would not lose information, but we should _not_ update the work
tree from the resulting index file" is lost.  For this reason,
the now code needs to resolve this case (#5ALT) internally.

This affects some existing tests in the test suite, but all in
positive ways.  In t1000 (3-way test), this #5ALT case now gets
one stage0 entry, instead of an identical stage2 and stage3
entry pair, for such a path, and one test that checked for merge
failure (because the test assumed the "stricter-than-necessary"
behaviour) does not have to fail anymore.  In t1005 (emu23
test), two tests that involves a case where the work tree
already had a change introduced in the upstream (aka "merged
head"), the merge succeeds instead of failing.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] read-tree --emu23.
Junio C Hamano [Sat, 11 Jun 2005 01:36:08 +0000 (18:36 -0700)]
[PATCH] read-tree --emu23.

This new flag causes two-way fast forward to internally use the
three-way merge mechanism.  This behaviour is intended to offer
a better fast forward semantics when used in a dirty work tree.

The new test t1005 is parallel to the existing t1001 "pure
2-way" tests, but some parts that are commented out would fail.
These failures are due to three-way merge enforcing too strict
index requirements for cases that could succeed.  This problem
will be addressed by later patches.

Without even changing three-way mechanism, the --emu23 two-way
fast forward already gives the user an easier-to-handle merge
result when a file that "merged head" updates has local
modifications.  This is demonstrated as "case 16" test in t1005.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Clean up read-tree two-way tests.
Junio C Hamano [Sat, 11 Jun 2005 01:34:34 +0000 (18:34 -0700)]
[PATCH] Clean up read-tree two-way tests.

This is in preparation for "2-way fast-forward emulated with
3-way mechanism" series.  It does not change what the tests for
pure 2-way do.  It only changes how it tests things, to make
reviewing of differences of the two tests easier in later steps.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Add --diff-filter= output restriction to diff-* family.
Junio C Hamano [Sun, 12 Jun 2005 03:57:13 +0000 (20:57 -0700)]
[PATCH] Add --diff-filter= output restriction to diff-* family.

This is a halfway between debugging aid and a helper to write an
ultra-smart merge scripts.  The new option takes a string that
consists of a list of "status" letters, and limits the diff
output to only those classes of changes, with two exceptions:

 - A broken pair (aka "complete rewrite"), does not match D
   (deleted) or N (created).  Use B to look for them.

 - The letter "A" in the diff-filter string does not match
   anything itself, but causes the entire diff that contains
   selected patches to be output (this behaviour is similar to
   that of --pickaxe-all for the -S option).

For example,

    $ git-rev-list HEAD |
      git-diff-tree --stdin -s -v -B -C --diff-filter=BCR

shows a list of commits that have complete rewrite, copy, or
rename.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] diff-tree: --find-copies-harder
Junio C Hamano [Sat, 11 Jun 2005 01:31:02 +0000 (18:31 -0700)]
[PATCH] diff-tree: --find-copies-harder

Normally, diff-tree does not feed unchanged filepair to diffcore
for performance reasons, so copies are detected only when the
source file of the copy happens to be modified in the same
changeset.  This adds --find-copies-harder flag to tell
diff-tree to sacrifice the performance in order to find copies
the same way as other commands in diff-* family.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Tutorial update to adjust for -B fix
Junio C Hamano [Fri, 3 Jun 2005 19:11:07 +0000 (12:11 -0700)]
[PATCH] Tutorial update to adjust for -B fix

Now -B does not say silly "complete rewrite" anymore for small
files such as the one in the tutorial example.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Fix rename/copy when dealing with temporarily broken pairs.
Junio C Hamano [Sun, 12 Jun 2005 03:55:20 +0000 (20:55 -0700)]
[PATCH] Fix rename/copy when dealing with temporarily broken pairs.

When rename/copy uses a file that was broken by diffcore-break
as the source, and the broken filepair gets merged back later,
the output was mislabeled as a rename.  In this case, the source
file ends up staying in the output, so we should label it as a
copy instead.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-whatchanged: make default output format be pretty.
Linus Torvalds [Mon, 13 Jun 2005 03:35:04 +0000 (20:35 -0700)]
git-whatchanged: make default output format be pretty.

If you want the raw stuff, just do

git-whatchanged --pretty=raw

and it wil act like it used to.

19 years agogit-diff-tree: fix output with just "--pretty".
Linus Torvalds [Mon, 13 Jun 2005 03:34:09 +0000 (20:34 -0700)]
git-diff-tree: fix output with just "--pretty".

It set verbose, but didn't set the output prefix to "diff-tree".

19 years ago[PATCH] Support commit_format in diff-tree
Junio C Hamano [Mon, 13 Jun 2005 00:44:21 +0000 (17:44 -0700)]
[PATCH] Support commit_format in diff-tree

This steals --pretty command line option from rev-list and
teaches diff-tree to do the same.  With this change,

    $ git-whatchanged --pretty

would work as expected.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Re-Fix SIGSEGV on unmerged files in git-diff-files -p
Junio C Hamano [Mon, 13 Jun 2005 00:23:15 +0000 (17:23 -0700)]
[PATCH] Re-Fix SIGSEGV on unmerged files in git-diff-files -p

When an unmerged path was fed via diff_unmerged() into diffcore,
it eventually called run_diff() with "one" and "two" parameters
with NULL, but run_diff() was not written carefully enough to
notice this situation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-apply: ignore empty git headers
Linus Torvalds [Sun, 12 Jun 2005 16:37:49 +0000 (09:37 -0700)]
git-apply: ignore empty git headers

A meaningful (ie non-empty) git patch always has more information in the
header than just the "diff --git" line itself: it needs to have either a
patch associated with it (which implies "---" and "+++" lines in the
header) or it needs to have rename/copy/delete/create information in it.

Just ignore git patches which have no change information. Otherwise we'll
end up with a patch that doesn't have filenames etc filled in, and we'll
be unhappy.

19 years ago[PATCH] Bugfix: read-cache.c:write_cache() misrecords number of entries.
Junio C Hamano [Fri, 10 Jun 2005 08:32:37 +0000 (01:32 -0700)]
[PATCH] Bugfix: read-cache.c:write_cache() misrecords number of entries.

When we choose to omit deleted entries, we should subtract
numbers of such entries from the total number in the header.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Oops.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-read-tree: remove deleted files in the working directory
Linus Torvalds [Thu, 9 Jun 2005 22:34:04 +0000 (15:34 -0700)]
git-read-tree: remove deleted files in the working directory

Only when "-u" is used of course.

19 years ago[PATCH] Add git-diff-stages command.
Junio C Hamano [Thu, 9 Jun 2005 22:13:13 +0000 (15:13 -0700)]
[PATCH] Add git-diff-stages command.

The diff-* brothers acquired a sibling, git-diff-stages.  With
an unmerged index file, you specify two stage numbers and it
shows the differences between them.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agogit-read-tree: add "--reset" flag
Linus Torvalds [Thu, 9 Jun 2005 19:51:01 +0000 (12:51 -0700)]
git-read-tree: add "--reset" flag

This is the same as "-m", but it will silently ignore any unmerged
entries, which makes it useful for efficiently forcing a new position
regardless of the state of the current index file.

IOW, to reset to a previous HEAD (in case you have had a failed
merge, for example), you'd just do

git-read-tree -u --reset HEAD

which will also update your working tree to the right state.

NOTE! The "update" will not remove files that may have been added by the
merge.  Yet.

19 years agoOne more time.. Clean up git-merge-one-file-script
Linus Torvalds [Thu, 9 Jun 2005 00:56:09 +0000 (17:56 -0700)]
One more time.. Clean up git-merge-one-file-script

This uses git-checkout-file to make sure that the full pathname is
created, instead of the script having to verify it by hand.  Also,
simplify the 3-way merge case by just writing to the right file and
setting the initial index contents early.

19 years agoFix up git-merge-one-file-script
Linus Torvalds [Thu, 9 Jun 2005 00:36:47 +0000 (17:36 -0700)]
Fix up git-merge-one-file-script

Junio points out that we may need to create the path leading
up the the file we merge.

And we need to be more careful with the "exec"s we've done
to exit on success - only do the on the last command in the
pipeline, not the first one ;)

19 years agoMerge my and Petr's git-merge-one-file-script modifications
Linus Torvalds [Wed, 8 Jun 2005 23:54:23 +0000 (16:54 -0700)]
Merge my and Petr's git-merge-one-file-script modifications

19 years ago[PATCH] git-merge-one-file-script cleanups from Cogito
Petr Baudis [Wed, 8 Jun 2005 23:38:20 +0000 (01:38 +0200)]
[PATCH] git-merge-one-file-script cleanups from Cogito

Chain the resolving sequences (e.g. git-cat-file - chmod -
git-update-cache) through &&s so we stop right away in case one of the
command fails, and report the error code to the script caller.

Also add a copyright notice, some blank lines, ;; on a separate line,
and nicer error messages.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoMake sure we error out if we can't remove a file on automatic merges.
Linus Torvalds [Wed, 8 Jun 2005 23:35:30 +0000 (16:35 -0700)]
Make sure we error out if we can't remove a file on automatic merges.

Pointed out by Junio.

19 years ago[PATCH] Tidy up some rev-list-related stuff
Petr Baudis [Wed, 8 Jun 2005 20:59:43 +0000 (22:59 +0200)]
[PATCH] Tidy up some rev-list-related stuff

This patch tidies up the git-rev-list documentation and epoch.c, which
are in severe clash with the unwritten coding style now, and quite
unreadable.

It also fixes up compile failures with older compilers due to variable
declarations after code.

The patch mostly wraps lines before or on the 80th column, removes
plenty of superfluous empty lines and changes comments from // to /* */.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Add read-tree -m 3-way merge tests.
Junio C Hamano [Wed, 8 Jun 2005 21:55:35 +0000 (14:55 -0700)]
[PATCH] Add read-tree -m 3-way merge tests.

This adds a set of tests to make sure that requirements on
existing cache entries are checked when a read-tree -m 3-way
merge is run with an already populated index file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Fix git-merge-one-file permissions auto-merging
Petr Baudis [Wed, 8 Jun 2005 21:26:55 +0000 (23:26 +0200)]
[PATCH] Fix git-merge-one-file permissions auto-merging

In the automerge case, permissions were not restored properly after the
merge tool was invoked and overwrote the target file.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoRemove MERGE_HEAD after committing merge
Linus Torvalds [Wed, 8 Jun 2005 20:44:32 +0000 (13:44 -0700)]
Remove MERGE_HEAD after committing merge

19 years agoMake "git commit" work correctly in the presense of a manual merge
Linus Torvalds [Wed, 8 Jun 2005 20:33:15 +0000 (13:33 -0700)]
Make "git commit" work correctly in the presense of a manual merge

This has gotten only very light testing, but something like this is
clearly necessary and did the right thing for the one case I threw at
it.

19 years agocvs-migration: add more of a header to the "annotate" discussion
Linus Torvalds [Wed, 8 Jun 2005 20:19:31 +0000 (13:19 -0700)]
cvs-migration: add more of a header to the "annotate" discussion

19 years ago[PATCH] Miniscule correction of diff-format.txt
Christian Meder [Thu, 2 Jun 2005 09:55:03 +0000 (11:55 +0200)]
[PATCH] Miniscule correction of diff-format.txt

Add missing "space" element to the description of the diff-format.

Signed-off-by: Christian Meder <chris@absolutegiganten.org>
Acked-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Anal retentive 'const unsigned char *sha1'
Jason McMullan [Fri, 3 Jun 2005 15:05:39 +0000 (11:05 -0400)]
[PATCH] Anal retentive 'const unsigned char *sha1'

Make 'sha1' parameters const where possible

Signed-off-by: Jason McMullan <jason.mcmullan@timesys.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] git-diff-cache: handle pathspec beginning with a dash
Jonas Fonseca [Mon, 6 Jun 2005 21:27:00 +0000 (23:27 +0200)]
[PATCH] git-diff-cache: handle pathspec beginning with a dash

Parse everything after '--' as tree name or pathspec.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoLeave merge failures in the filesystem
Linus Torvalds [Wed, 8 Jun 2005 18:40:59 +0000 (11:40 -0700)]
Leave merge failures in the filesystem

This changes how we handle merges: if a automated merge
fails, we will leave the index as a clean entry pointing
to the original branch, and leave the actual file _dirty_
the way the "merge" program left it.

You can then just do "git-diff-files -p" to see what the
merge conflicts did, fix them up, and commit the end result.

NOTE NOTE NOTE! Do _not_ use "git commit" to commit such
a merge. It won't set the parents right. I'll need to fix
that. In the meantime, you'd need to merge using

git-commit-tree $(git-write) -p HEAD -p MERGE_HEAD

or something like that by hand.