git-pickaxe: work properly in a subdirectory.
We forgot to add prefix to the given path. [jc: interestingly enough, Jeff King had the same idea after I pushed mine out to "pu", and his patch was cleaner, so I dropped mine.] Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Jeff King committed
Nov 2, 2006 at 02:22 UTC
20239bae943733d766e6475cf0916966c868246b
1 file changed
+11
-4
builtin-pickaxe.c
+11
-4
@@ -1428,6 +1428,13 @@ static unsigned parse_score(const char *arg)
1428
return score;
1429
}
1430
1431
+static const char *add_prefix(const char *prefix, const char *path)
1432
+{
1433
+ if (!prefix || !prefix[0])
1434
+ return path;
1435
+ return prefix_path(prefix, strlen(prefix), path);
1436
+}
1437
+
1438
int cmd_pickaxe(int argc, const char **argv, const char *prefix)
1439
{
1440
struct rev_info revs;
@@ -1548,7 +1555,7 @@ int cmd_pickaxe(int argc, const char **argv, const char *prefix)
1555
/* (1) */
1556
if (argc <= i)
1557
usage(pickaxe_usage);
1551
- path = argv[i];
1558
+ path = add_prefix(prefix, argv[i]);
1559
if (i + 1 == argc - 1) {
1560
if (unk != 1)
1561
usage(pickaxe_usage);
@@ -1566,13 +1573,13 @@ int cmd_pickaxe(int argc, const char **argv, const char *prefix)
1573
if (seen_dashdash) {
1574
if (seen_dashdash + 1 != argc - 1)
1575
usage(pickaxe_usage);
1569
- path = argv[seen_dashdash + 1];
1576
+ path = add_prefix(prefix, argv[seen_dashdash + 1]);
1577
for (j = i; j < seen_dashdash; j++)
1578
argv[unk++] = argv[j];
1579
}
1580
else {
1581
/* (3) */
1575
- path = argv[i];
1582
+ path = add_prefix(prefix, argv[i]);
1583
if (i + 1 == argc - 1) {
1584
final_commit_name = argv[i + 1];
1585
@@ -1580,7 +1587,7 @@ int cmd_pickaxe(int argc, const char **argv, const char *prefix)
1587
* old-style
1588
*/
1589
if (unk == 1 && !has_path_in_work_tree(path)) {
1583
- path = argv[i + 1];
1590
+ path = add_prefix(prefix, argv[i + 1]);
1591
final_commit_name = argv[i];
1592
}
1593
}