Fix broken create_branch() in builtin-branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Mar 8, 2007 at 13:59 UTC
45994a1e33398e55426268fcd5d4ab3143497e29
1 file changed
+17
-14
builtin-branch.c
+17
-14
@@ -410,7 +410,6 @@ static void set_branch_defaults(const char *name, const char *real_ref)
410
}
411
412
static void create_branch(const char *name, const char *start_name,
413
- unsigned char *start_sha1,
413
int force, int reflog, int track)
414
{
415
struct ref_lock *lock;
@@ -431,15 +430,22 @@ static void create_branch(const char *name, const char *start_name,
430
forcing = 1;
431
}
432
434
- if (start_sha1) {
435
- /* detached HEAD */
436
- hashcpy(sha1, start_sha1);
433
+ real_ref = NULL;
434
+ if (get_sha1(start_name, sha1))
435
+ die("Not a valid object name: '%s'.", start_name);
436
+
437
+ switch (dwim_ref(start_name, strlen(start_name), sha1, &real_ref)) {
438
+ case 0:
439
+ /* Not branching from any existing branch */
440
real_ref = NULL;
438
- }
439
- else if (dwim_ref(start_name, strlen(start_name), sha1, &real_ref) > 1)
441
+ break;
442
+ case 1:
443
+ /* Unique completion -- good */
444
+ break;
445
+ default:
446
die("Ambiguous object name: '%s'.", start_name);
441
- else if (real_ref == NULL)
442
- die("Not a valid object name: '%s'.", start_name);
447
+ break;
448
+ }
449
450
if ((commit = lookup_commit_reference(sha1)) == NULL)
451
die("Not a valid branch point: '%s'.", start_name);
@@ -620,12 +626,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
626
rename_branch(head, argv[i], force_rename);
627
else if (rename && (i == argc - 2))
628
rename_branch(argv[i], argv[i + 1], force_rename);
623
- else if (i == argc - 1)
624
- create_branch(argv[i], head, head_sha1, force_create, reflog,
625
- track);
626
- else if (i == argc - 2)
627
- create_branch(argv[i], argv[i+1], NULL, force_create, reflog,
628
- track);
629
+ else if (i == argc - 1 || i == argc - 2)
630
+ create_branch(argv[i], (i == argc - 2) ? argv[i+1] : head,
631
+ force_create, reflog, track);
632
else
633
usage(builtin_branch_usage);
634