Merge fixes up to GIT 1.1.2

Junio C Hamano · Junio C Hamano · commit 429608fc365d · 2006-01-13T16:51:21.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -28,6 +28,7 @@ git-diff-files
 git-diff-index
 git-diff-stages
 git-diff-tree
+git-describe
 git-fetch
 git-fetch-pack
 git-findtags
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
@@ -25,7 +25,9 @@ information.
 OPTIONS
 -------
 -a|--all::
-	Update all paths in the index file.
+	Update all paths in the index file.  This flag notices
+	files that have been modified and deleted, but new files
+	you have not told about git are not affected.
 
 -c or -C <commit>::
 	Take existing commit object, and reuse the log message
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
@@ -145,6 +145,32 @@ brings your index file and the working tree back to that state,
 and resets the tip of the branch to that commit.
 ------------
 
+Interrupted workflow::
++
+You can get interrupted by an ungent fix request while you are
+still in the middle of a large change.  The files in your
+working tree are not in any shape to be committed yet, but you
+need to get to the other branch for a quick bugfix.
++
+------------
+$ git checkout feature ;# you were working in "feature" branch and
+$ work work work       ;# got interrupted
+$ git commit -a -m 'snapshot WIP' <1>
+$ git checkout master
+$ fix fix fix
+$ git commit ;# commit with real log
+$ git checkout feature
+$ git reset --soft HEAD^ ;# go back to WIP state <2>
+$ git reset <3>
+
+<1> This commit will get blown away so a throw-away log message is OK.
+<2> This removes the 'WIP' commit from the commit history, and makes
+    your working tree in the state just before you made that snapshot.
+<3> After <2>, the index file still has all the WIP changes you
+    committed in <1>.  This sets it to the last commit you were
+    basing the WIP changes on.
+------------
+
 Author
 ------
 Written by Junio C Hamano <junkio@cox.net> and Linus Torvalds <torvalds@osdl.org>
@@ -156,4 +182,3 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 GIT
 ---
 Part of the gitlink:git[7] suite
-
diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
@@ -134,9 +134,9 @@ is often useful.
 +
 Some short-cut notations are also supported.
 +
-* For backward compatibility, `tag` is almost ignored;
-  it just makes the following parameter <tag> to mean a
-  refspec `refs/tags/<tag>:refs/tags/<tag>`.
+* `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`; 
+  used with pull or fetch, it requests fetching everything up to
+  the given tag.
 * A parameter <ref> without a colon is equivalent to
   <ref>: when pulling/fetching, and <ref>`:`<ref> when
   pushing.  That is, do not store it locally if
diff --git a/describe.c b/describe.c
@@ -132,10 +132,11 @@ static void describe(char *arg)
 		if (n) {
 			printf("%s-g%s\n", n->path,
 			       find_unique_abbrev(cmit->object.sha1, abbrev));
-			break;
+			clear_commit_marks(cmit, SEEN);
+			return;
 		}
 	}
-	clear_commit_marks(cmit, SEEN);
+	die("cannot describe '%s'", sha1_to_hex(cmit->object.sha1));
 }
 
 int main(int argc, char **argv)
diff --git a/name-rev.c b/name-rev.c
@@ -93,10 +93,11 @@ static int name_ref(const char *path, const unsigned char *sha1)
 	}
 	if (o && o->type == commit_type) {
 		struct commit *commit = (struct commit *)o;
-		const char *p;
 
-		while ((p = strchr(path, '/')))
-			path = p+1;
+		if (!strncmp(path, "refs/heads/", 11))
+			path = path + 11;
+		else if (!strncmp(path, "refs/", 5))
+			path = path + 5;
 
 		name_rev(commit, strdup(path), 0, 0, deref);
 	}
diff --git a/show-branch.c b/show-branch.c
@@ -496,7 +496,7 @@ static void append_one_rev(const char *av)
 		append_ref(av, revkey);
 		return;
 	}
-	if (strchr(av, '*') || strchr(av, '?')) {
+	if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) {
 		/* glob style match */
 		int saved_matches = ref_name_cnt;
 		match_ref_pattern = av;
diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh
@@ -46,14 +46,14 @@ H=$(doit 8 H $A $F)
 
 test_expect_success 'compute merge-base (single)' \
     'MB=$(git-merge-base G H) &&
-     expr "$(git-name-rev "$MB")" : "[0-9a-f]* B"'
+     expr "$(git-name-rev "$MB")" : "[0-9a-f]* tags/B"'
 
 test_expect_success 'compute merge-base (all)' \
     'MB=$(git-merge-base --all G H) &&
-     expr "$(git-name-rev "$MB")" : "[0-9a-f]* B"'
+     expr "$(git-name-rev "$MB")" : "[0-9a-f]* tags/B"'
 
 test_expect_success 'compute merge-base with show-branch' \
     'MB=$(git-show-branch --merge-base G H) &&
-     expr "$(git-name-rev "$MB")" : "[0-9a-f]* B"'
+     expr "$(git-name-rev "$MB")" : "[0-9a-f]* tags/B"'
 
 test_done
diff --git a/update-index.c b/update-index.c
@@ -534,10 +534,17 @@ int main(int argc, const char **argv)
 		struct strbuf buf;
 		strbuf_init(&buf);
 		while (1) {
+			char *path_name;
 			read_line(&buf, stdin, line_termination);
 			if (buf.eof)
 				break;
-			update_one(buf.buf, prefix, prefix_length);
+			if (line_termination && buf.buf[0] == '"')
+				path_name = unquote_c_style(buf.buf, NULL);
+			else
+				path_name = buf.buf;
+			update_one(path_name, prefix, prefix_length);
+			if (path_name != buf.buf)
+				free(path_name);
 		}
 	}
 	if (active_cache_changed) {

Original file line number	Diff line number	Diff line change
`@@ -134,9 +134,9 @@ is often useful.`
`134`	`134`	`+`
`135`	`135`	`Some short-cut notations are also supported.`
`136`	`136`	`+`
`137`		-* For backward compatibility, `tag` is almost ignored;
`138`		`- it just makes the following parameter <tag> to mean a`
`139`		- refspec `refs/tags/<tag>:refs/tags/<tag>`.
	`137`	+* `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;
	`138`	`+ used with pull or fetch, it requests fetching everything up to`
	`139`	`+ the given tag.`
`140`	`140`	`* A parameter <ref> without a colon is equivalent to`
`141`	`141`	<ref>: when pulling/fetching, and <ref>`:`<ref> when
`142`	`142`	`pushing. That is, do not store it locally if`
Original file line number	Diff line number	Diff line change
`@@ -132,10 +132,11 @@ static void describe(char *arg)`
`132`	`132`	`if (n) {`
`133`	`133`	`printf("%s-g%s\n", n->path,`
`134`	`134`	`find_unique_abbrev(cmit->object.sha1, abbrev));`
`135`		`- break;`
	`135`	`+ clear_commit_marks(cmit, SEEN);`
	`136`	`+ return;`
`136`	`137`	`}`
`137`	`138`	`}`
`138`		`- clear_commit_marks(cmit, SEEN);`
	`139`	`+ die("cannot describe '%s'", sha1_to_hex(cmit->object.sha1));`
`139`	`140`	`}`
`140`	`141`
`141`	`142`	`int main(int argc, char **argv)`
Original file line number	Diff line number	Diff line change
`@@ -93,10 +93,11 @@ static int name_ref(const char path, const unsigned char sha1)`
`93`	`93`	`}`
`94`	`94`	`if (o && o->type == commit_type) {`
`95`	`95`	`struct commit commit = (struct commit )o;`
`96`		`- const char *p;`
`97`	`96`
`98`		`- while ((p = strchr(path, '/')))`
`99`		`- path = p+1;`
	`97`	`+ if (!strncmp(path, "refs/heads/", 11))`
	`98`	`+ path = path + 11;`
	`99`	`+ else if (!strncmp(path, "refs/", 5))`
	`100`	`+ path = path + 5;`
`100`	`101`
`101`	`102`	`name_rev(commit, strdup(path), 0, 0, deref);`
`102`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,7 @@ static void append_one_rev(const char *av)`
`496`	`496`	`append_ref(av, revkey);`
`497`	`497`	`return;`
`498`	`498`	`}`
`499`		`- if (strchr(av, '*') \|\| strchr(av, '?')) {`
	`499`	`+ if (strchr(av, '*') \|\| strchr(av, '?') \|\| strchr(av, '[')) {`
`500`	`500`	`/* glob style match */`
`501`	`501`	`int saved_matches = ref_name_cnt;`
`502`	`502`	`match_ref_pattern = av;`