From 2ecb5ea2ad375017eedf73bd0130fa9ca33010d2 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Tue, 25 Sep 2007 07:03:46 -0700 Subject: Move convert-objects to contrib. convert-objects was needed to convert from an old-style repository, which hashed the compressed contents and used a different date format. Such repositories are presumably no longer common and, if such conversions are necessary, should be done by writing a frontend for git-fast-import. Linus, the original author, is OK with moving it to contrib. Signed-off-by: Matt Kraai Signed-off-by: Junio C Hamano --- .gitignore | 1 - 1 file changed, 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 63c918c667..e0b91befb9 100644 --- a/.gitignore +++ b/.gitignore @@ -25,7 +25,6 @@ git-clone git-commit git-commit-tree git-config -git-convert-objects git-count-objects git-cvsexportcommit git-cvsimport -- cgit v1.2.3 From a2a9150bf06bdab419016003fa1bc04905d0f4fb Mon Sep 17 00:00:00 2001 From: Kristof Provost Date: Sat, 6 Oct 2007 16:24:42 +0200 Subject: makefile: Add a cscope target The current makefile supports ctags but not cscope. Some people prefer cscope (I do), so this patch adds a cscope target. I've also added cscope* to the .gitignore file. For some reason tags and TAGS weren't in there either so I've added them too. Signed-off-by: Kristof Provost Signed-off-by: Lars Hjemli Signed-off-by: Shawn O. Pearce --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index e0b91befb9..62afef2347 100644 --- a/.gitignore +++ b/.gitignore @@ -171,3 +171,6 @@ config.status config.mak.autogen config.mak.append configure +tags +TAGS +cscope* -- cgit v1.2.3 From beb474379315654566e78eea8a0e39c66ebcbb8a Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 13 Oct 2007 17:34:45 +0100 Subject: Add tests for parse-options.c Signed-off-by: Johannes Schindelin Signed-off-by: Shawn O. Pearce --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 62afef2347..249b451b87 100644 --- a/.gitignore +++ b/.gitignore @@ -154,6 +154,7 @@ test-delta test-dump-cache-tree test-genrandom test-match-trees +test-parse-options test-sha1 common-cmds.h *.tar.gz -- cgit v1.2.3 From fee9832a8dea5d9c98c5c3a4797615d52814df16 Mon Sep 17 00:00:00 2001 From: Gerrit Pape Date: Tue, 30 Oct 2007 14:24:27 +0000 Subject: No longer install git-svnimport, move to contrib/examples This has been proposed for a few times without much reaction from the list. Actually remove it to see who screams. Signed-off-by: Gerrit Pape Signed-off-by: Junio C Hamano --- .gitignore | 1 - 1 file changed, 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 62afef2347..8670081adf 100644 --- a/.gitignore +++ b/.gitignore @@ -128,7 +128,6 @@ git-status git-stripspace git-submodule git-svn -git-svnimport git-symbolic-ref git-tag git-tar-tree -- cgit v1.2.3 From f5bbc3225c4b073a7ff3218164a0c820299bc9c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 8 Nov 2007 11:59:00 -0500 Subject: Port git commit to C. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes git commit a builtin and moves git-commit.sh to contrib/examples. This also removes the git-runstatus helper, which was mostly just a git-status.sh implementation detail. Signed-off-by: Kristian Høgsberg Signed-off-by: Junio C Hamano --- .gitignore | 1 - 1 file changed, 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index c8c13f5503..bbd7f558e7 100644 --- a/.gitignore +++ b/.gitignore @@ -109,7 +109,6 @@ git-rev-list git-rev-parse git-revert git-rm -git-runstatus git-send-email git-send-pack git-sh-setup -- cgit v1.2.3 From f2dc849e9c5fe363ad089f6c3f2b7b3d79fd6a6f Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sun, 2 Dec 2007 14:14:13 +0000 Subject: Add 'git fast-export', the sister of 'git fast-import' This program dumps (parts of) a git repository in the format that fast-import understands. For clarity's sake, it does not use the 'inline' method of specifying blobs in the commits, but builds the blobs before building the commits. Since signed tags' signatures will not necessarily be valid (think transformations after the export, or excluding revisions, changing the history), there are 4 modes to handle them: abort (default), ignore, warn and strip. The latter just turns the tags into unsigned ones. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index c8c13f5503..916fabc6c5 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ git-diff-files git-diff-index git-diff-tree git-describe +git-fast-export git-fast-import git-fetch git-fetch--tool -- cgit v1.2.3 From bf79caffbc5a3587af2360dde67d8d5c3a3a4196 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 10 Dec 2007 05:29:18 -0500 Subject: Add git-browse-help to .gitignore Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index bac60ce31a..5eaba41995 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ git-archive git-bisect git-blame git-branch +git-browse-help git-bundle git-cat-file git-check-attr -- cgit v1.2.3 From 5b4617c7490921f3ea871231f71d6baa2288bf93 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 14 Dec 2007 22:02:57 -0800 Subject: Rename git-browse-help helper to git-browse--help Signed-off-by: Junio C Hamano --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 5eaba41995..aef01c5a2b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ git-archive git-bisect git-blame git-branch -git-browse-help +git-browse--help git-bundle git-cat-file git-check-attr -- cgit v1.2.3 From d7e522cffb2224b91c9c0edde093fbb81a0289b0 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sun, 16 Dec 2007 02:21:04 -0500 Subject: rename git-browse--help to git-help--browse The convention for helper scripts has been git-$TOOL--$HELPER. Since this is a "browse" helper for the "help" tool, git-help--browse is a more sensible name. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index aef01c5a2b..dab5bc2a3c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,6 @@ git-archive git-bisect git-blame git-branch -git-browse--help git-bundle git-cat-file git-check-attr @@ -52,6 +51,7 @@ git-gc git-get-tar-commit-id git-grep git-hash-object +git-help--browse git-http-fetch git-http-push git-imap-send -- cgit v1.2.3 From feb7f38b01761a695ecf53f94237251c1d3aa650 Mon Sep 17 00:00:00 2001 From: Charles Bailey Date: Thu, 20 Dec 2007 13:00:40 +0000 Subject: Remove old generated files from .gitignore. Some entries in .gitignore are obselete. These should be cleaned up just for the sake of general tidiness and so that any developers who have a working tree that was moved forward without a clean know that they have old stuff in their work tree. Signed-off-by: Charles Bailey Signed-off-by: Junio C Hamano --- .gitignore | 6 ------ 1 file changed, 6 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index dab5bc2a3c..7f8421dcd0 100644 --- a/.gitignore +++ b/.gitignore @@ -41,7 +41,6 @@ git-fetch git-fetch--tool git-fetch-pack git-filter-branch -git-findtags git-fmt-merge-msg git-for-each-ref git-format-patch @@ -59,7 +58,6 @@ git-index-pack git-init git-init-db git-instaweb -git-local-fetch git-log git-lost-found git-ls-files @@ -120,10 +118,6 @@ git-show git-show-branch git-show-index git-show-ref -git-ssh-fetch -git-ssh-pull -git-ssh-push -git-ssh-upload git-stash git-status git-stripspace -- cgit v1.2.3 From 897d39ced4a670dd46df489b25561926dfb011dc Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 8 Feb 2008 13:33:51 +0000 Subject: Adjust .gitignore for 5884f1(Rename 'git-help--browse.sh'...) Since git-help--browse was renamed, we should ignore git-web--browse instead. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 7f8421dcd0..165b256e2e 100644 --- a/.gitignore +++ b/.gitignore @@ -50,7 +50,6 @@ git-gc git-get-tar-commit-id git-grep git-hash-object -git-help--browse git-http-fetch git-http-push git-imap-send @@ -136,6 +135,7 @@ git-upload-pack git-var git-verify-pack git-verify-tag +git-web--browse git-whatchanged git-write-tree git-core-*/?* -- cgit v1.2.3 From 7cf7f54a65aa1c70e21fe73753f6b0671d129adf Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sun, 24 Feb 2008 14:40:45 -0500 Subject: use build-time SHELL_PATH in test scripts The top-level Makefile now creates a GIT-BUILD-OPTIONS file which stores any options selected by the make process that may be of use to further parts of the build process. Specifically, we store the SHELL_PATH so that it can be used by tests to construct shell scripts on the fly. The format of the GIT-BUILD-OPTIONS file is Bourne shell, and it is sourced by test-lib.sh; all tests can rely on just having $SHELL_PATH correctly set in the environment. The GIT-BUILD-OPTIONS file is written every time the toplevel 'make' is invoked. Since the only users right now are the test scripts, there's no drawback to updating its timestamp. If something build-related depends on this, we can do a trick similar to the one used by GIT-CFLAGS. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 165b256e2e..4ff2fec278 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +GIT-BUILD-OPTIONS GIT-CFLAGS GIT-GUI-VARS GIT-VERSION-FILE -- cgit v1.2.3 From ae299be0e5e610027e6492d48d70c1cbb0e9edd8 Mon Sep 17 00:00:00 2001 From: David Reiss Date: Mon, 19 May 2008 23:48:54 -0700 Subject: Implement normalize_absolute_path normalize_absolute_path removes several oddities form absolute paths, giving nice clean paths like "/dir/sub1/sub2". Also add a test case for this utility, based on a new test program (in the style of test-sha1). Signed-off-by: David Reiss Signed-off-by: Junio C Hamano --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 4ff2fec278..c54c473e94 100644 --- a/.gitignore +++ b/.gitignore @@ -150,6 +150,7 @@ test-dump-cache-tree test-genrandom test-match-trees test-parse-options +test-path-utils test-sha1 common-cmds.h *.tar.gz -- cgit v1.2.3 From d553e737897e8edbbc2092bf345fc58b2dae5251 Mon Sep 17 00:00:00 2001 From: David Reiss Date: Mon, 19 May 2008 23:49:00 -0700 Subject: Fold test-absolute-path into test-path-utils Signed-off-by: David Reiss Signed-off-by: Junio C Hamano --- .gitignore | 1 - 1 file changed, 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index c54c473e94..31ea9f13ba 100644 --- a/.gitignore +++ b/.gitignore @@ -142,7 +142,6 @@ git-write-tree git-core-*/?* gitk-wish gitweb/gitweb.cgi -test-absolute-path test-chmtime test-date test-delta -- cgit v1.2.3 From 51add76e92c9de9bcad3d421303b45ab488d529e Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sat, 5 Jul 2008 16:43:51 +0200 Subject: Retire 'stupid' merge strategy As pointed out by Linus, this strategy tries to take the best merge base, but 'recursive' just does it better. If one needs something more than 'resolve' then he/she should really use 'recursive' and not 'stupid'. Cf. Message-ID: Signed-off-by: Junio C Hamano --- .gitignore | 1 - 1 file changed, 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 4ff2fec278..8054d9ddb8 100644 --- a/.gitignore +++ b/.gitignore @@ -75,7 +75,6 @@ git-merge-one-file git-merge-ours git-merge-recursive git-merge-resolve -git-merge-stupid git-merge-subtree git-mergetool git-mktag -- cgit v1.2.3 From 13613eac5bf886b37cc583462999419f91c98a17 Mon Sep 17 00:00:00 2001 From: Gustaf Hendeby Date: Wed, 13 Aug 2008 23:32:43 +0200 Subject: Update .gitignore to ignore git-help Signed-off-by: Gustaf Hendeby Signed-off-by: Junio C Hamano --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index a213e8e25b..bbaf9de0bc 100644 --- a/.gitignore +++ b/.gitignore @@ -51,6 +51,7 @@ git-gc git-get-tar-commit-id git-grep git-hash-object +git-help git-http-fetch git-http-push git-imap-send -- cgit v1.2.3 From c76b4c81e79f423c3d50f0cfadcf74de3bee8aea Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 3 Dec 2008 22:42:03 -0500 Subject: add stage to gitignore This is a generated builtin since 24b1f65f (Install git-stage in exec-path). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index bbaf9de0bc..d9adce585a 100644 --- a/.gitignore +++ b/.gitignore @@ -118,6 +118,7 @@ git-show git-show-branch git-show-index git-show-ref +git-stage git-stash git-status git-stripspace -- cgit v1.2.3 From 055a5975258f37eecdfcf609a472ab4957a59263 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 20 Dec 2008 13:05:33 +0100 Subject: Add a script to edit/inspect notes The script 'git notes' allows you to edit and show commit notes, by calling either git notes show or git notes edit Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index d9adce585a..f89428b968 100644 --- a/.gitignore +++ b/.gitignore @@ -82,6 +82,7 @@ git-mktag git-mktree git-name-rev git-mv +git-notes git-pack-redundant git-pack-objects git-pack-refs -- cgit v1.2.3 From 4a16d072723b48699ea162da24eff05eba298834 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 22 Jan 2009 01:02:35 -0500 Subject: chain kill signals for cleanup functions If a piece of code wanted to do some cleanup before exiting (e.g., cleaning up a lockfile or a tempfile), our usual strategy was to install a signal handler that did something like this: do_cleanup(); /* actual work */ signal(signo, SIG_DFL); /* restore previous behavior */ raise(signo); /* deliver signal, killing ourselves */ For a single handler, this works fine. However, if we want to clean up two _different_ things, we run into a problem. The most recently installed handler will run, but when it removes itself as a handler, it doesn't put back the first handler. This patch introduces sigchain, a tiny library for handling a stack of signal handlers. You sigchain_push each handler, and use sigchain_pop to restore whoever was before you in the stack. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index d9adce585a..f28a54d262 100644 --- a/.gitignore +++ b/.gitignore @@ -152,6 +152,7 @@ test-match-trees test-parse-options test-path-utils test-sha1 +test-sigchain common-cmds.h *.tar.gz *.dsc -- cgit v1.2.3 From d6716c026666319824096401cd448b3694732d26 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Sat, 24 Jan 2009 17:17:55 +0100 Subject: Ignore test-ctype Signed-off-by: Benjamin Kramer Signed-off-by: Junio C Hamano --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index d9adce585a..e8f91ce8cd 100644 --- a/.gitignore +++ b/.gitignore @@ -144,6 +144,7 @@ git-core-*/?* gitk-wish gitweb/gitweb.cgi test-chmtime +test-ctype test-date test-delta test-dump-cache-tree -- cgit v1.2.3 From 954cfb5cfd17d57b9b31b19b73efe73199407e07 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 10 Feb 2009 21:31:33 -0800 Subject: Revert "Merge branch 'js/notes'" This reverts commit 7b75b331f6744fbf953fe8913703378ef86a2189, reversing changes made to 5d680a67d7909c89af96eba4a2d77abed606292b. --- .gitignore | 1 - 1 file changed, 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 13311f1d5e..1c57d4c958 100644 --- a/.gitignore +++ b/.gitignore @@ -82,7 +82,6 @@ git-mktag git-mktree git-name-rev git-mv -git-notes git-pack-redundant git-pack-objects git-pack-refs -- cgit v1.2.3 From afcbc8e7ecb18a3ee542e808f02f5df7d56d5bdc Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Tue, 7 Apr 2009 01:21:20 -0700 Subject: difftool: move 'git-difftool' out of contrib This prepares 'git-difftool' and its documentation for mainstream use. 'git-difftool-helper' became 'git-difftool--helper' since users should not use it directly. 'git-difftool' was added to the list of commands as an ancillaryinterrogator. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 1c57d4c958..a36da9d981 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,8 @@ git-diff git-diff-files git-diff-index git-diff-tree +git-difftool +git-difftool--helper git-describe git-fast-export git-fast-import -- cgit v1.2.3 From 21d0ba7ebb0c6b6c6ad844f8a40fff8dd4c0b105 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Wed, 8 Apr 2009 00:17:20 -0700 Subject: difftool/mergetool: refactor commands to use git-mergetool--lib This consolidates the common functionality from git-mergetool and git-difftool--helper into a single git-mergetool--lib scriptlet. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index a36da9d981..757c7f0ad9 100644 --- a/.gitignore +++ b/.gitignore @@ -80,6 +80,7 @@ git-merge-recursive git-merge-resolve git-merge-subtree git-mergetool +git-mergetool--lib git-mktag git-mktree git-name-rev -- cgit v1.2.3 From f800b65bea1504299747e7be03ee279508a74e1f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 12 Apr 2009 21:15:59 -0700 Subject: gitignore git-bisect--helper Signed-off-by: Junio C Hamano --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 1c57d4c958..16f7a97d97 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ git-apply git-archimport git-archive git-bisect +git-bisect--helper git-blame git-branch git-bundle -- cgit v1.2.3