8cc6a08319
This adds a new "git bisect" command. - "git bisect start" start bisection search. - "git bisect bad <rev>" mark some version known-bad (if no arguments, then current HEAD) - "git bisect good <revs>..." mark some versions known-good (if no arguments, then current HEAD) - "git bisect reset <branch>" done with bisection search and go back to your work (if no arguments, then "master"). The way you use it is: git bisect start git bisect bad # Current version is bad git bisect good v2.6.13-rc2 # v2.6.13-rc2 was the last version # tested that was good When you give at least one bad and one good versions, it will bisect the revision tree and say something like: Bisecting: 675 revisions left to test after this and check out the state in the middle. Now, compile that kernel, and boot it. Now, let's say that this booted kernel works fine, then just do git bisect good # this one is good which will now say Bisecting: 337 revisions left to test after this and you continue along, compiling that one, testing it, and depending on whether it is good or bad, you say "git bisect good" or "git bisect bad", and ask for the next bisection. Until you have no more left, and you'll have been left with the first bad kernel rev in "refs/bisect/bad". Oh, and then after you want to reset to the original head, do a git bisect reset to get back to the master branch, instead of being in one of the bisection branches ("git bisect start" will do that for you too, actually: it will reset the bisection state, and before it does that it checks that you're not using some old bisection branch). Not really any harder than doing series of "quilt push" and "quilt pop", now is it? [jc: This patch is a rework based on what Linus posted to the list. The changes are: - The original introduced four separate commands, which was three too many, so I merged them into one with subcommands. - Since the next thing you would want to do after telling it "bad" and "good" is always to bisect, this version does it automatically for you. - I think the termination condition was wrong. The original version checked if the set of revisions reachable from next bisection but not rechable from any of the known good ones is empty, but if the current bisection was a bad one, this would not terminate, so I changed it to terminate it when the set becomes a singleton or empty. - Removed the use of shell array variable. ] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
226 lines
5.9 KiB
Makefile
226 lines
5.9 KiB
Makefile
# Define MOZILLA_SHA1 environment variable when running make to make use of
|
|
# a bundled SHA1 routine coming from Mozilla. It is GPL'd and should be fast
|
|
# on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default
|
|
# choice) has very fast version optimized for i586.
|
|
#
|
|
# Define NO_OPENSSL environment variable if you do not have OpenSSL. You will
|
|
# miss out git-rev-list --merge-order. This also implies MOZILLA_SHA1.
|
|
#
|
|
# Define PPC_SHA1 environment variable when running make to make use of
|
|
# a bundled SHA1 routine optimized for PowerPC.
|
|
|
|
|
|
# Define COLLISION_CHECK below if you believe that SHA1's
|
|
# 1461501637330902918203684832716283019655932542976 hashes do not give you
|
|
# sufficient guarantee that no collisions between objects will ever happen.
|
|
|
|
# DEFINES += -DCOLLISION_CHECK
|
|
|
|
# Define USE_NSEC below if you want git to care about sub-second file mtimes
|
|
# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
|
|
# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely
|
|
# randomly break unless your underlying filesystem supports those sub-second
|
|
# times (my ext3 doesn't).
|
|
|
|
# DEFINES += -DUSE_NSEC
|
|
|
|
# Define USE_STDEV below if you want git to care about the underlying device
|
|
# change being considered an inode change from the update-cache perspective.
|
|
|
|
# DEFINES += -DUSE_STDEV
|
|
|
|
GIT_VERSION=0.99.2
|
|
|
|
COPTS?=-g -O2
|
|
CFLAGS+=$(COPTS) -Wall $(DEFINES)
|
|
|
|
prefix=$(HOME)
|
|
bindir=$(prefix)/bin
|
|
# dest=
|
|
|
|
CC?=gcc
|
|
AR?=ar
|
|
INSTALL?=install
|
|
RPMBUILD?=rpmbuild
|
|
|
|
# sparse is architecture-neutral, which means that we need to tell it
|
|
# explicitly what architecture to check for. Fix this up for yours..
|
|
SPARSE_FLAGS?=-D__BIG_ENDIAN__ -D__powerpc__
|
|
|
|
|
|
|
|
### --- END CONFIGURATION SECTION ---
|
|
|
|
|
|
|
|
SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
|
|
git-pull-script git-tag-script git-resolve-script git-whatchanged \
|
|
git-fetch-script git-status-script git-commit-script \
|
|
git-log-script git-shortlog git-cvsimport-script git-diff-script \
|
|
git-reset-script git-add-script git-checkout-script git-clone-script \
|
|
gitk git-cherry git-rebase-script git-relink-script git-repack-script \
|
|
git-format-patch-script git-sh-setup-script git-push-script \
|
|
git-branch-script git-parse-remote git-verify-tag-script \
|
|
git-ls-remote-script git-clone-dumb-http git-rename-script \
|
|
git-request-pull-script git-bisect-script
|
|
|
|
PROG= git-update-cache git-diff-files git-init-db git-write-tree \
|
|
git-read-tree git-commit-tree git-cat-file git-fsck-cache \
|
|
git-checkout-cache git-diff-tree git-rev-tree git-ls-files \
|
|
git-check-files git-ls-tree git-merge-base git-merge-cache \
|
|
git-unpack-file git-export git-diff-cache git-convert-cache \
|
|
git-http-pull git-ssh-push git-ssh-pull git-rev-list git-mktag \
|
|
git-diff-helper git-tar-tree git-local-pull git-hash-object \
|
|
git-get-tar-commit-id git-apply git-stripspace \
|
|
git-diff-stages git-rev-parse git-patch-id git-pack-objects \
|
|
git-unpack-objects git-verify-pack git-receive-pack git-send-pack \
|
|
git-prune-packed git-fetch-pack git-upload-pack git-clone-pack \
|
|
git-show-index git-daemon git-var git-peek-remote \
|
|
git-update-server-info git-show-rev-cache git-build-rev-cache
|
|
|
|
LIB_FILE=libgit.a
|
|
LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h epoch.h csum-file.h \
|
|
pack.h pkt-line.h refs.h
|
|
LIB_OBJS=read-cache.o sha1_file.o usage.o object.o commit.o tree.o blob.o \
|
|
tag.o date.o index.o diff-delta.o patch-delta.o entry.o path.o \
|
|
refs.o csum-file.o pack-check.o pkt-line.o connect.o ident.o
|
|
|
|
LIB_H += rev-cache.h
|
|
LIB_OBJS += rev-cache.o
|
|
|
|
LIB_H += strbuf.h
|
|
LIB_OBJS += strbuf.o
|
|
|
|
LIB_H += quote.h
|
|
LIB_OBJS += quote.o
|
|
|
|
LIB_H += diff.h count-delta.h
|
|
DIFF_OBJS = diff.o diffcore-rename.o diffcore-pickaxe.o diffcore-pathspec.o \
|
|
diffcore-break.o diffcore-order.o
|
|
LIB_OBJS += $(DIFF_OBJS) count-delta.o
|
|
|
|
LIB_OBJS += gitenv.o
|
|
LIB_OBJS += server-info.o
|
|
|
|
LIBS = $(LIB_FILE)
|
|
LIBS += -lz
|
|
|
|
ifndef NO_OPENSSL
|
|
LIB_OBJS += epoch.o
|
|
OPENSSL_LIBSSL=-lssl
|
|
else
|
|
CFLAGS += '-DNO_OPENSSL'
|
|
MOZILLA_SHA1=1
|
|
OPENSSL_LIBSSL=
|
|
endif
|
|
ifdef MOZILLA_SHA1
|
|
SHA1_HEADER="mozilla-sha1/sha1.h"
|
|
LIB_OBJS += mozilla-sha1/sha1.o
|
|
else
|
|
ifdef PPC_SHA1
|
|
SHA1_HEADER="ppc/sha1.h"
|
|
LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
|
|
else
|
|
SHA1_HEADER=<openssl/sha.h>
|
|
ifeq ($(shell uname -s),Darwin)
|
|
LIBS += -lcrypto -lssl
|
|
else
|
|
LIBS += -lcrypto
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'
|
|
|
|
|
|
|
|
### Build rules
|
|
|
|
all: $(PROG)
|
|
|
|
|
|
.PRECIOUS: %.o
|
|
git-%: %.o $(LIB_FILE)
|
|
$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
|
|
|
|
git-http-pull: pull.o
|
|
git-local-pull: pull.o
|
|
git-ssh-pull: rsh.o pull.o
|
|
git-ssh-push: rsh.o
|
|
|
|
git-http-pull: LIBS += -lcurl
|
|
git-rev-list: LIBS += $(OPENSSL_LIBSSL)
|
|
|
|
$(LIB_OBJS): $(LIB_H)
|
|
$(DIFF_OBJS): diffcore.h
|
|
|
|
$(LIB_FILE): $(LIB_OBJS)
|
|
$(AR) rcs $@ $(LIB_OBJS)
|
|
|
|
doc:
|
|
$(MAKE) -C Documentation all
|
|
|
|
|
|
|
|
### Testing rules
|
|
|
|
test: all
|
|
$(MAKE) -C t/ all
|
|
|
|
test-date: test-date.c date.o
|
|
$(CC) $(CFLAGS) -o $@ test-date.c date.o
|
|
|
|
test-delta: test-delta.c diff-delta.o patch-delta.o
|
|
$(CC) $(CFLAGS) -o $@ $^
|
|
|
|
check:
|
|
for i in *.c; do sparse $(CFLAGS) $(SPARSE_FLAGS) $$i; done
|
|
|
|
|
|
|
|
### Installation rules
|
|
|
|
install: $(PROG) $(SCRIPTS)
|
|
$(INSTALL) -m755 -d $(dest)$(bindir)
|
|
$(INSTALL) $(PROG) $(SCRIPTS) $(dest)$(bindir)
|
|
|
|
install-tools:
|
|
$(MAKE) -C tools install
|
|
|
|
install-doc:
|
|
$(MAKE) -C Documentation install
|
|
|
|
|
|
|
|
|
|
### Maintainer's dist rules
|
|
|
|
git-core.spec: git-core.spec.in Makefile
|
|
sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@
|
|
|
|
GIT_TARNAME=git-core-$(GIT_VERSION)
|
|
dist: git-core.spec git-tar-tree
|
|
./git-tar-tree HEAD $(GIT_TARNAME) > $(GIT_TARNAME).tar
|
|
@mkdir -p $(GIT_TARNAME)
|
|
@cp git-core.spec $(GIT_TARNAME)
|
|
tar rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git-core.spec
|
|
@rm -rf $(GIT_TARNAME)
|
|
gzip -f -9 $(GIT_TARNAME).tar
|
|
|
|
rpm: dist
|
|
$(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz
|
|
|
|
|
|
backup: clean
|
|
cd .. ; tar czvf dircache.tar.gz dir-cache
|
|
|
|
|
|
|
|
### Cleaning rules
|
|
|
|
clean:
|
|
rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
|
|
rm -f git-core-*.tar.gz git-core.spec
|
|
$(MAKE) -C tools/ clean
|
|
$(MAKE) -C Documentation/ clean
|