fmt-merge-msg: detached HEAD

PATCH In review Santi Béjar 2 participants 6 messages Jun 15, 2016

lore

Share & tools

lore

Santi Béjar

author

2016-06-15 22:42 UTC #0 lore raw

PATCH 1/1 fmt-merge-msg: detached HEAD

Do not say 'Merge ... into HEAD' when detached.

Signed-off-by Santi Béjar <[email protected]>

---
 builtin-fmt-merge-msg.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

builtin-fmt-merge-msg.c +2 -1

index 87d3d63..8cef425 100644
@@ -331,7 +331,8 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
 			printf(" of %s", srcs.list[i]);
 	}
 
-	if (!strcmp("master", current_branch))
+	if (!strcmp("master", current_branch) ||
+	    !strcmp("HEAD", current_branch))
 		putchar('\n');
 	else
 		printf(" into %s\n", current_branch);

Signature · 1 line

1.5.0.rc2.g2fa185-dirty

Santi Béjar

author

2016-06-15 22:42 UTC #2 lore raw

Quoted 26 lines · Junio C Hamano

Quoted 12 lines · Santi Béjar
Do not say 'Merge ... into HEAD' when detached.
Signed-off-by Santi Béjar <[email protected]>
---
 builtin-fmt-merge-msg.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
builtin-fmt-merge-msg.c +0 -0
index 87d3d63..8cef425 100644
builtin-fmt-merge-msg.c int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix) · line 338
Quoted 9 lines
builtin-fmt-merge-msg.c +2 -1
@@ -331,7 +331,8 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
                      printf(" of %s", srcs.list[i]);
      }
 
-     if (!strcmp("master", current_branch))
+     if (!strcmp("master", current_branch) ||
+         !strcmp("HEAD", current_branch))
              putchar('\n');
      else
              printf(" into %s\n", current_branch);
Hmph.

Quoted 1 line

The reason is?

For me, 'Merge ... into master' and 'Merge ... into HEAD' are equally useful, so do not show them by default. And git always merges into HEAD.

Santi

Junio C Hamano

2016-06-15 22:42 UTC #3 lore raw

Quoted 17 lines · Santi Béjar

Quoted 17 lines

Quoted 5 lines

builtin-fmt-merge-msg.c +0 -0
index 87d3d63..8cef425 100644

builtin-fmt-merge-msg.c int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix) · line 338

Quoted 9 lines

builtin-fmt-merge-msg.c +2 -1

@@ -331,7 +331,8 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
                      printf(" of %s", srcs.list[i]);
      }
 
-     if (!strcmp("master", current_branch))
+     if (!strcmp("master", current_branch) ||
+         !strcmp("HEAD", current_branch))
              putchar('\n');
      else
              printf(" into %s\n", current_branch);

Hmph.

Quoted 5 lines

Quoted 1 line
The reason is?
For me, 'Merge ... into master' and 'Merge ... into HEAD' are equally useful, so do not show them by default. And git always merges into HEAD.

I was wondering if people might prefer rewording it to "into detached HEAD".

Santi Béjar

author

2016-06-15 22:42 UTC #4 lore raw

Quoted 19 lines · Junio C Hamano

Quoted 17 lines · Santi Béjar

Quoted 17 lines

Quoted 5 lines

builtin-fmt-merge-msg.c +0 -0
index 87d3d63..8cef425 100644

builtin-fmt-merge-msg.c int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix) · line 338

Quoted 9 lines

builtin-fmt-merge-msg.c +2 -1

@@ -331,7 +331,8 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
                      printf(" of %s", srcs.list[i]);
      }
 
-     if (!strcmp("master", current_branch))
+     if (!strcmp("master", current_branch) ||
+         !strcmp("HEAD", current_branch))
              putchar('\n');
      else
              printf(" into %s\n", current_branch);

Hmph.

Quoted 8 lines

Quoted 5 lines
Quoted 1 line
The reason is?
For me, 'Merge ... into master' and 'Merge ... into HEAD' are equally useful, so do not show them by default. And git always merges into HEAD.
I was wondering if people might prefer rewording it to "into detached HEAD".

I prefer my patch, but your rewording is OK also.

Santi

Junio C Hamano

2016-06-15 22:42 UTC #5 lore raw

Quoted 8 lines · Santi Béjar

Quoted 6 lines
Quoted 3 lines
For me, 'Merge ... into master' and 'Merge ... into HEAD' are equally useful, so do not show them by default. And git always merges into HEAD.
I was wondering if people might prefer rewording it to "into detached HEAD".
I prefer my patch, but your rewording is OK also.

I do not personally care either way -- the question is "is merging while your head is detached a major deal, or is it just one of the random insignificant merges and it does not matter where it happened?"