On Tue, May 8, 2012 at 1:34 PM, Johannes Sixt <j.sixt@xxxxxxxxxxxxx> wrote:
> Am 5/8/2012 13:24, schrieb Erik Faye-Lund:
>> + git show-ref | !grep "(null)"
> ...
>> Now, doing this doesn't make my test above pass,
>
> It is unlikely to pass if you used this test script literally, because
>
> $ !grep
> !grep: command not found
>
> "!" is not an operator in a shell script. Insert a space.
Whoops, you are of course right, my bad. Actually, inserting a space
doesn't quite do the trick, but doing
"! (git show-ref | grep "(null)")" instead seems to work. I'm no
shell-script wizard ;)
The test still fails, though :)
I didn't actually fix up the code so the test failed, so I guess
that's why I didn't see a false negative. Instead, I fixed up the code
so it failed earlier.
But if I apply the following patch, the test passes. I'm not saying
it's the right thing to do, though.
(Warning: white-space damaged because of copying diffs between terminals)
---8<---
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 23fc56d..d70e819 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1096,8 +1096,11 @@ int cmd_checkout(int argc, const char **argv,
const char *prefix)
int flag;
if (!read_ref_full("HEAD", rev, 0, &flag) &&
- (flag & REF_ISSYMREF) && is_null_sha1(rev))
+ (flag & REF_ISSYMREF) && is_null_sha1(rev)) {
+ if (!opts.new_branch)
+ return 0;
return switch_unborn_to_new_branch(&opts);
+ }
}
return switch_branches(&opts, &new);
}
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 81827e6..5b1932c 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -520,4 +520,16 @@ test_expect_success 'moving the superproject does
not break submodules' '
)
'
+test_expect_failure 'committing to empty submodule does not create
(null) branch' '
+ test_create_repo empty-repo &&
+ git submodule add ./empty-repo empty-submodule &&
+ (
+ cd empty-submodule &&
+ echo "foo" > bar.txt &&
+ git add bar.txt &&
+ git commit -m. &&
+ ! (git show-ref | grep "(null)")
+ )
+'
+
test_done
---8<---
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html