On Tue, May 7, 2013 at 4:55 PM, Felipe Contreras
<felipe.contreras@xxxxxxxxx> wrote:
> While trying to add support for the @ shortcut lots of cleanups arised. Here
> they are in a single series.
>
> Felipe Contreras (7):
> tests: at-combinations: simplify setup
> tests: at-combinations: check ref names directly
> tests: at-combinations: improve nonsense()
> sha1_name: remove no-op
> sha1_name: remove unnecessary braces
> sha1_name: avoid Yoda conditions
> sha1_name: reorganize get_sha1_basic()
>
> Ramkumar Ramachandra (4):
> tests: at-combinations: increase coverage
> tests: at-combinations: @{N} versus HEAD@{N}
> sha1_name: don't waste cycles in the @-parsing loop
> sha1_name: check @{-N} errors sooner
When merging this series to the @ shortcut one, there will be
conflicts, this is how I propose fixing them:
return len; /* syntax Ok, not enough switches */
- if (0 < len && len == namelen)
+ if (len > 0 && len == namelen)
return len; /* consumed all */
- else if (0 < len)
...
++ else if (len > 0)
+ return reinterpret(name, namelen, len, buf);
- check "@" new-two
- check "@@{u}" upstream-two
...
++check "@" ref refs/heads/new-branch
++check "@@{u}" ref refs/heads/upstream-branch
If that creates some kind of problem I would rather throw away this
series rather than the other one.
Cheers.
--
Felipe Contreras
--
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