Skip to contentSkip to conversation

git-merge: rewrite already up to date message (#934)

gitgitgadget/git Josh Soref 3 participants 4 messages May 2, 2021 – May 3, 2021 2 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): gitgitgadget/git/pull/[email protected]

A message that is not in the archive (sent off-list or not yet received): gitgitgadget/git/pull/934/[email protected]

Josh Soref

author
#2 lore raw

notes-merge.c int notes_merge(struct notes_merge_options *o, · line 634

Quoted 13 lines · Eric Sunshine
notes-merge.c +1 -1
index d2771fa3d4..321155fc87 100644
@@ -628,7 +628,7 @@ int notes_merge(struct notes_merge_options *o,
  if (oideq(&remote->object.oid, base_oid)) {
  /* Already merged; result == local commit */
  if (o->verbosity >= 2)
- printf("Already up to date!\n");
+ printf_ln("Already up to date.");
  oidcpy(result_oid, &local->object.oid);
  goto found_result;
  }

Should this have _(...) decorations?

#3 lore raw
Quoted 8 lines · Josh Soref

notes-merge.c int notes_merge(struct notes_merge_options *o, · line 629

Quoted 5 lines · Eric Sunshine
notes-merge.c +1 -1
@@ -628,7 +628,7 @@ int notes_merge(struct notes_merge_options *o,
  if (o->verbosity >= 2)
- printf("Already up to date!\n");
+ printf_ln("Already up to date.");

Should this have _(...) decorations?

Yes, indeed. I'll fix it in a re-roll and mention it in the commit message.

#4 lore raw
Quoted 9 lines · Eric Sunshine
Quoted 6 lines · Josh Soref

notes-merge.c

Quoted 3 lines · Eric Sunshine
notes-merge.c +1 -1
- printf("Already up to date!\n");
+ printf_ln("Already up to date.");

Should this have _(...) decorations?

Yes, indeed. I'll fix it in a re-roll and mention it in the commit message.

On second thought, I don't think I will make this change since none of the messages in notes-merge.c have been marked for localization yet -- and there are a lot of messages in that file -- so wrapping just this one message in _(...) would be inconsistent, and marking all messages in notes-merge.c as localizable is outside the scope of this series.

So, at the moment, I don't plan on re-rolling this series, and hopefully Junio can pick it up as-is (but, of course, will re-roll if someone spots something which needs fixing).

#5 lore raw
Quoted 6 lines · Eric Sunshine

On second thought, I don't think I will make this change since none of the messages in notes-merge.c have been marked for localization yet -- and there are a lot of messages in that file -- so wrapping just this one message in _(...) would be inconsistent, and marking all messages in notes-merge.c as localizable is outside the scope of this series.

I looked at the neighbouring code when I gave the "grep" output, because I wondered exactly about the same thing, and I agree with your conclusion here.

Quoted 3 lines

So, at the moment, I don't plan on re-rolling this series, and hopefully Junio can pick it up as-is (but, of course, will re-roll if someone spots something which needs fixing).

Thanks.