diff options
| -rwxr-xr-x | Documentation/build-docdep.perl | 4 | ||||
| -rw-r--r-- | Documentation/git-tag.txt | 4 | ||||
| -rw-r--r-- | Documentation/howto/using-topic-branches.txt | 14 | ||||
| -rw-r--r-- | INSTALL | 9 | ||||
| -rw-r--r-- | apply.c | 25 | ||||
| -rwxr-xr-x | git-cvsexportcommit.perl | 2 | ||||
| -rwxr-xr-x | git-merge-recursive.py | 13 | ||||
| -rwxr-xr-x | git-tag.sh | 9 | ||||
| -rw-r--r-- | http-fetch.c | 4 | ||||
| -rw-r--r-- | http-push.c | 26 | ||||
| -rw-r--r-- | t/Makefile | 11 | ||||
| -rwxr-xr-x | t/t5000-tar-tree.sh | 1 | ||||
| -rw-r--r-- | templates/Makefile | 1 |
13 files changed, 73 insertions, 50 deletions
diff --git a/Documentation/build-docdep.perl b/Documentation/build-docdep.perl index 6ff35e02fa..489389c32a 100755 --- a/Documentation/build-docdep.perl +++ b/Documentation/build-docdep.perl @@ -22,15 +22,11 @@ my $changed = 1; while ($changed) { $changed = 0; while (my ($text, $included) = each %include) { - print STDERR "Looking at $text...\n"; for my $i (keys %$included) { - print STDERR "$text includes $i.\n"; # $text has include::$i; if $i includes $j # $text indirectly includes $j. if (exists $include{$i}) { - print STDERR "$i includes something.\n"; for my $j (keys %{$include{$i}}) { - print STDERR "$text includes $i include $j\n"; if (!exists $include{$text}{$j}) { $include{$text}{$j} = 1; $included{$j} = 1; diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 3984812cec..95de436c10 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -8,7 +8,7 @@ git-tag - Create a tag object signed with GPG SYNOPSIS -------- -'git-tag' [-a | -s | -u <key-id>] [-f] [-m <msg>] <name> [<head>] +'git-tag' [-a | -s | -u <key-id>] [-f | -d] [-m <msg>] <name> [<head>] DESCRIPTION ----------- @@ -30,6 +30,8 @@ A GnuPG signed tag object will be created when `-s` or `-u committer identity for the current user is used to find the GnuPG key for signing. +`-d <tag>` deletes the tag. + Author ------ diff --git a/Documentation/howto/using-topic-branches.txt b/Documentation/howto/using-topic-branches.txt index c6c635a51e..4698abe46b 100644 --- a/Documentation/howto/using-topic-branches.txt +++ b/Documentation/howto/using-topic-branches.txt @@ -9,7 +9,7 @@ GIT as a Linux subsystem maintainer. -Tony -Last updated w.r.t. GIT 0.99.5 +Last updated w.r.t. GIT 0.99.9f Linux subsystem maintenance using GIT ------------------------------------- @@ -89,8 +89,8 @@ out at the current tip of the linus branch. These can be easily kept up to date by merging from the "linus" branch: - $ git checkout test && git resolve test linus "Auto-update from upstream" - $ git checkout release && git resolve release linus "Auto-update from upstream" + $ git checkout test && git merge "Auto-update from upstream" test linus + $ git checkout release && git merge "Auto-update from upstream" release linus Set up so that you can push upstream to your public tree (you need to log-in to the remote system and create an empty tree there before the @@ -128,7 +128,7 @@ commit to this branch. When you are happy with the state of this change, you can pull it into the "test" branch in preparation to make it public: - $ git checkout test && git resolve test speed-up-spinlocks "Pull speed-up-spinlock changes" + $ git checkout test && git merge "Pull speed-up-spinlock changes" test speed-up-spinlocks It is unlikely that you would have any conflicts here ... but you might if you spent a while on this step and had also pulled new versions from upstream. @@ -138,7 +138,7 @@ same branch into the "release" tree ready to go upstream. This is where you see the value of keeping each patch (or patch series) in its own branch. It means that the patches can be moved into the "release" tree in any order. - $ git checkout release && git resolve release speed-up-spinlocks "Pull speed-up-spinlock changes" + $ git checkout release && git merge "Pull speed-up-spinlock changes" release speed-up-spinlocks After a while, you will have a number of branches, and despite the well chosen names you picked for each of them, you may forget what @@ -190,7 +190,7 @@ Here are some of the scripts that I use to simplify all this even further. case "$1" in test|release) - git checkout $1 && git resolve $1 linus "Auto-update from upstream" + git checkout $1 && git merge "Auto-update from upstream" $1 linus ;; linus) before=$(cat .git/refs/heads/linus) @@ -231,7 +231,7 @@ test|release) echo $1 already merged into $2 1>&2 exit 1 fi - git checkout $2 && git resolve $2 $1 "Pull $1 into $2 branch" + git checkout $2 && git merge "Pull $1 into $2 branch" $2 $1 ;; *) usage @@ -5,10 +5,13 @@ Normally you can just do "make" followed by "make install", and that will install the git programs in your own ~/bin/ directory. If you want to do a global install, you can do - make prefix=/usr install + $ make prefix=/usr ;# as yourself + # make prefix=/usr install ;# as root -(or prefix=/usr/local, of course). Some day somebody may send me a RPM -spec file or something, and you can do "make rpm" or whatever. +(or prefix=/usr/local, of course). Just like any program suite +that uses $prefix, the built results have some paths encoded, +which are derived from $prefix, so "make all; make prefix=/usr +install" would not work. Issues of note: @@ -53,7 +53,7 @@ struct fragment { struct patch { char *new_name, *old_name, *def_name; unsigned int old_mode, new_mode; - int is_rename, is_copy, is_new, is_delete; + int is_rename, is_copy, is_new, is_delete, is_binary; int lines_added, lines_deleted; int score; struct fragment *fragments; @@ -890,8 +890,18 @@ static int parse_chunk(char *buffer, unsigned long size, struct patch *patch) patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch); - if (!patchsize && !metadata_changes(patch)) - die("patch with only garbage at line %d", linenr); + if (!patchsize && !metadata_changes(patch)) { + static const char binhdr[] = "Binary files "; + + if (sizeof(binhdr) - 1 < size - offset - hdrsize && + !memcmp(binhdr, buffer + hdrsize, sizeof(binhdr)-1)) + patch->is_binary = 1; + + if (patch->is_binary && !apply && !check) + ; + else + die("patch with only garbage at line %d", linenr); + } return offset + hdrsize + patchsize; } @@ -949,9 +959,12 @@ static void show_stats(struct patch *patch) add = (add * max + max_change / 2) / max_change; del = total - add; } - printf(" %s%-*s |%5d %.*s%.*s\n", prefix, - len, name, patch->lines_added + patch->lines_deleted, - add, pluses, del, minuses); + if (patch->is_binary) + printf(" %s%-*s | Bin\n", prefix, len, name); + else + printf(" %s%-*s |%5d %.*s%.*s\n", prefix, + len, name, patch->lines_added + patch->lines_deleted, + add, pluses, del, minuses); if (qname) free(qname); } diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl index 7074b0c21b..50b041c324 100755 --- a/git-cvsexportcommit.perl +++ b/git-cvsexportcommit.perl @@ -64,7 +64,7 @@ if ($parent) { last; }; # found it die "Did not find $parent in the parents for this commit!"; -s } + } } else { # we don't have a parent from the cmdline... if (@parents == 1) { # it's safe to get it from the commit $parent = $parents[0]; diff --git a/git-merge-recursive.py b/git-merge-recursive.py index 9983cd9dee..90e889c300 100755 --- a/git-merge-recursive.py +++ b/git-merge-recursive.py @@ -162,13 +162,10 @@ def mergeTrees(head, merge, common, branch1Name, branch2Name): # Low level file merging, update and removal # ------------------------------------------ -MERGE_NONE = 0 -MERGE_TRIVIAL = 1 -MERGE_3WAY = 2 def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode, branch1Name, branch2Name): - merge = MERGE_NONE + merge = False clean = True if stat.S_IFMT(aMode) != stat.S_IFMT(bMode): @@ -181,7 +178,7 @@ def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode, sha = bSha else: if aSha != oSha and bSha != oSha: - merge = MERGE_TRIVIAL + merge = True if aMode == oMode: mode = bMode @@ -211,7 +208,6 @@ def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode, os.unlink(src1) os.unlink(src2) - merge = MERGE_3WAY clean = (code == 0) else: assert(stat.S_ISLNK(aMode) and stat.S_ISLNK(bMode)) @@ -299,6 +295,7 @@ def uniquePath(path, branch): else: raise + branch = branch.replace('/', '_') newPath = path + '_' + branch suffix = 0 while newPath in currentFileSet or \ @@ -590,7 +587,7 @@ def processRenames(renamesA, renamesB, branchNameA, branchNameB): if merge or not clean: print 'Renaming', fmtRename(path, ren1.dstName) - if merge == MERGE_3WAY: + if merge: print 'Auto-merging', ren1.dstName if not clean: @@ -668,7 +665,7 @@ def processRenames(renamesA, renamesB, branchNameA, branchNameB): if merge or not clean: print 'Renaming', fmtRename(ren1.srcName, ren1.dstName) - if merge == MERGE_3WAY: + if merge: print 'Auto-merging', ren1.dstName if not clean: diff --git a/git-tag.sh b/git-tag.sh index 6130904a94..1375945307 100755 --- a/git-tag.sh +++ b/git-tag.sh @@ -4,7 +4,7 @@ . git-sh-setup || die "Not a git archive" usage () { - echo >&2 "Usage: git-tag [-a | -s | -u <key-id>] [-f] [-m <msg>] <tagname> [<head>]" + echo >&2 "Usage: git-tag [-a | -s | -u <key-id>] [-f | -d] [-m <msg>] <tagname> [<head>]" exit 1 } @@ -37,6 +37,13 @@ do shift username="$1" ;; + -d) + shift + tag_name="$1" + rm "$GIT_DIR/refs/tags/$tag_name" && \ + echo "Deleted tag $tag_name." + exit $? + ;; -*) usage ;; diff --git a/http-fetch.c b/http-fetch.c index ea8af1b2de..88b74b4341 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -569,7 +569,7 @@ static void release_request(struct transfer_request *request) } #ifdef USE_CURL_MULTI -void process_curl_messages(void) +static void process_curl_messages(void) { int num_messages; struct active_request_slot *slot; @@ -625,7 +625,7 @@ void process_curl_messages(void) } } -void process_request_queue(void) +static void process_request_queue(void) { struct transfer_request *request = request_queue_head; struct active_request_slot *slot = active_queue_head; diff --git a/http-push.c b/http-push.c index 0b90fb9ae3..8866189332 100644 --- a/http-push.c +++ b/http-push.c @@ -595,7 +595,7 @@ static void start_move(struct transfer_request *request) } } -int refresh_lock(struct active_lock *lock) +static int refresh_lock(struct active_lock *lock) { struct active_request_slot *slot; char *if_header; @@ -726,7 +726,7 @@ static void release_request(struct transfer_request *request) } #ifdef USE_CURL_MULTI -void process_curl_messages(void) +static void process_curl_messages(void) { int num_messages; struct active_request_slot *slot; @@ -766,7 +766,7 @@ void process_curl_messages(void) } } -void process_request_queue(void) +static void process_request_queue(void) { struct transfer_request *request = request_queue_head; struct active_request_slot *slot = active_queue_head; @@ -799,7 +799,7 @@ void process_request_queue(void) } #endif -void process_waiting_requests(void) +static void process_waiting_requests(void) { struct active_request_slot *slot = active_queue_head; @@ -812,7 +812,7 @@ void process_waiting_requests(void) } } -void add_request(unsigned char *sha1, struct active_lock *lock) +static void add_request(unsigned char *sha1, struct active_lock *lock) { struct transfer_request *request = request_queue_head; struct packed_git *target; @@ -939,7 +939,7 @@ static int setup_index(unsigned char *sha1) return 0; } -static int fetch_indices() +static int fetch_indices(void) { unsigned char sha1[20]; char *url; @@ -1189,7 +1189,7 @@ end_lockprop_element(void *userData, const char *name) } } -struct active_lock *lock_remote(char *file, long timeout) +static struct active_lock *lock_remote(char *file, long timeout) { struct active_request_slot *slot; struct buffer out_buffer; @@ -1318,7 +1318,7 @@ struct active_lock *lock_remote(char *file, long timeout) return new_lock; } -int unlock_remote(struct active_lock *lock) +static int unlock_remote(struct active_lock *lock) { struct active_request_slot *slot; char *lock_token_header; @@ -1359,7 +1359,7 @@ int unlock_remote(struct active_lock *lock) return rc; } -int check_locking() +static int check_locking(void) { struct active_request_slot *slot; struct buffer in_buffer; @@ -1425,7 +1425,7 @@ int check_locking() return 1; } -int is_ancestor(unsigned char *sha1, struct commit *commit) +static int is_ancestor(unsigned char *sha1, struct commit *commit) { struct commit_list *parents; @@ -1446,8 +1446,8 @@ int is_ancestor(unsigned char *sha1, struct commit *commit) return 0; } -void get_delta(unsigned char *sha1, struct object *obj, - struct active_lock *lock) +static void get_delta(unsigned char *sha1, struct object *obj, + struct active_lock *lock) { struct commit *commit; struct commit_list *parents; @@ -1503,7 +1503,7 @@ void get_delta(unsigned char *sha1, struct object *obj, } } -int update_remote(unsigned char *sha1, struct active_lock *lock) +static int update_remote(unsigned char *sha1, struct active_lock *lock) { struct active_request_slot *slot; char *out_data; diff --git a/t/Makefile b/t/Makefile index 5c76afff83..5c5a620126 100644 --- a/t/Makefile +++ b/t/Makefile @@ -15,9 +15,14 @@ shellquote = '$(call shq,$(1))' T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh) -all: - @$(foreach t,$T,echo "*** $t ***"; $(call shellquote,$(SHELL_PATH)) $t $(GIT_TEST_OPTS) || exit; ) - @rm -fr trash +all: $(T) clean + +$(T): + @echo "*** $@ ***"; $(call shellquote,$(SHELL_PATH)) $@ $(GIT_TEST_OPTS) clean: rm -fr trash + +.PHONY: $(T) clean +.NOPARALLEL: + diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 4db1bb1142..adc5e937de 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -25,6 +25,7 @@ commit id embedding: ' . ./test-lib.sh +TAR=${TAR:-tar} test_expect_success \ 'populate workdir' \ diff --git a/templates/Makefile b/templates/Makefile index 07e928e56d..8f7f4fec34 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -13,7 +13,6 @@ shq = $(subst ','\'',$(1)) shellquote = '$(call shq,$(1))' all: boilerplates.made custom - find blt # Put templates that can be copied straight from the source # in a file direc--tory--file in the source. They will be |